Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable immersive mode confirmation for test automation" into lmp-dev

Browse Source
This commit is contained in:
Guang Zhu
2014-08-18 17:23:08 +00:00
committed by Android (Google) Code Review
parent f6040e9c11 1dbead1103
commit b511c4c1d6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
policy/src/com/android/internal/policy/impl/PolicyControl.java
View File

@@ -16,6 +16,7 @@
package com.android.internal.policy.impl;
import android.app.ActivityManager;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
@@ -104,8 +105,9 @@ public class PolicyControl {
}
public static boolean disableImmersiveConfirmation(String pkg) {
return sImmersivePreconfirmationsFilter != null
&& sImmersivePreconfirmationsFilter.matches(pkg);
return (sImmersivePreconfirmationsFilter != null
&& sImmersivePreconfirmationsFilter.matches(pkg))
|| ActivityManager.isRunningInTestHarness();
}
public static void reloadFromSetting(Context context) {