PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RequestPermissionHelperActivity: policy transparency for BT disallowed

Browse Source 
Don't try to enable Bluetooth if it was disallowed, show a policy
transparency dialog instead.

Test: manual with CtsVerifier

Bug: 32895313

Change-Id: I9dd535a959b65f172cf2dcdd5483773d4f67366c
This commit is contained in:
Lenka Trochtova
2017-01-26 15:34:52 +01:00
parent 77af2af66a
commit a2070edbf2
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
View File

@@ -17,12 +17,14 @@
package com.android.settings.bluetooth; package com.android.settings.bluetooth;
import android.app.Activity; import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -125,8 +127,19 @@ public class RequestPermissionHelperActivity extends AlertActivity implements
switch (mRequest) { switch (mRequest) {
case RequestPermissionActivity.REQUEST_ENABLE: case RequestPermissionActivity.REQUEST_ENABLE:
case RequestPermissionActivity.REQUEST_ENABLE_DISCOVERABLE: { case RequestPermissionActivity.REQUEST_ENABLE_DISCOVERABLE: {
UserManager userManager = getSystemService(UserManager.class);
if (userManager.hasUserRestriction(UserManager.DISALLOW_BLUETOOTH)) {
// If Bluetooth is disallowed, don't try to enable it, show policy transparency
// message instead.
DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);
Intent intent = dpm.createAdminSupportIntent(UserManager.DISALLOW_BLUETOOTH);
if (intent != null) {
startActivity(intent);
}
} else {
mLocalAdapter.enable(); mLocalAdapter.enable();
setResult(Activity.RESULT_OK); setResult(Activity.RESULT_OK);
}
} break; } break;
case RequestPermissionActivity.REQUEST_DISABLE: { case RequestPermissionActivity.REQUEST_DISABLE: {