Merge "Add checks for new changes in DPM.reboot()" into ub-testdpc-nyc

Author: Mahaver Chopra

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

@@ -48,6 +48,7 @@
 import android.security.KeyChain;
 import android.security.KeyChainAliasCallback;
 import android.support.v4.content.FileProvider;
+import android.telephony.TelephonyManager;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.Log;
@@ -310,6 +311,7 @@ public class PolicyManagementFragment extends PreferenceFragment implements
     private String mPackageName;
     private ComponentName mAdminComponentName;
     private UserManager mUserManager;
+    private TelephonyManager mTelephonyManager;
 
     private SwitchPreference mDisableCameraSwitchPreference;
     private SwitchPreference mDisableScreenCaptureSwitchPreference;
@@ -336,6 +338,8 @@ public void onCreate(Bundle savedInstanceState) {
         mDevicePolicyManager = (DevicePolicyManager) getActivity().getSystemService(
                 Context.DEVICE_POLICY_SERVICE);
         mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        mTelephonyManager = (TelephonyManager) getActivity()
+                .getSystemService(Context.TELEPHONY_SERVICE);
         mPackageManager = getActivity().getPackageManager();
         mPackageName = getActivity().getPackageName();
 
@@ -2055,6 +2059,10 @@ private void showWifiConfigCreationDialog() {
     }
 
     private void reboot() {
+        if (mTelephonyManager.getCallState() != TelephonyManager.CALL_STATE_IDLE) {
+            showToast(R.string.reboot_error_msg);
+            return;
+        }
         mDevicePolicyManager.reboot(mAdminComponentName);
     }
 

app/src/main/res/values/strings.xml

@@ -93,7 +93,10 @@
         owner?
     </string>
     <string name="device_owner_removed">This app is no longer a device owner.</string>
+
+    <!-- Strings for device reboot -->
     <string name="reboot">Reboot device</string>
+    <string name="reboot_error_msg">Cannot reboot device during an ongoing call.</string>
 
     <!-- Strings for cross-profile intent filters -->
     <string name="cross_profile_intents">Cross-profile intents</string>