openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Using grantRuntimePermission() 

"pm grant" is considered obsolete

Bug: 145686584
Change-Id: Ieeec76b2fdb666f89957a0a3039956bd69e9f315
This commit is contained in:
vadimt 2020-01-07 14:54:53 -08:00
parent 0fd48b51ba
commit aad54ab686
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/AndroidManifest-common.xml
View File

@ -22,6 +22,7 @@
<uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
<uses-permission android:name="android.permission.READ_LOGS"/>
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
<application android:debuggable="true">
<uses-library android:name="android.test.runner"/>

22
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
View File

@ -183,13 +183,8 @@ public final class LauncherInstrumentation {
.authority(testProviderAuthority)
.build();
try {
mDevice.executeShellCommand("pm grant " + testPackage +
" android.permission.WRITE_SECURE_SETTINGS");
} catch (IOException e) {
fail(e.toString());
}
mInstrumentation.getUiAutomation().grantRuntimePermission(
testPackage, "android.permission.WRITE_SECURE_SETTINGS");
PackageManager pm = getContext().getPackageManager();
ProviderInfo pi = pm.resolveContentProvider(
@ -336,14 +331,11 @@ public final class LauncherInstrumentation {
private String getSystemHealthMessage() {
final String testPackage = getContext().getPackageName();
try {
mDevice.executeShellCommand("pm grant " + testPackage +
" android.permission.READ_LOGS");
mDevice.executeShellCommand("pm grant " + testPackage +
" android.permission.PACKAGE_USAGE_STATS");
} catch (IOException e) {
e.printStackTrace();
}
mInstrumentation.getUiAutomation().grantRuntimePermission(
testPackage, "android.permission.READ_LOGS");
mInstrumentation.getUiAutomation().grantRuntimePermission(
testPackage, "android.permission.PACKAGE_USAGE_STATS");
return mSystemHealthSupplier != null
? mSystemHealthSupplier.apply(START_TIME)