commit dbbc7af06363435492410227c3c2b703ebda80e4
author Suprabh Shukla <suprabh@google.com> Wed Jul 06 16:32:56 2016 -0700
committer Suprabh Shukla <suprabh@google.com> Thu Jul 07 14:12:14 2016 -0700
tree c35cf60fc7229ebe97fe3e46d8e92f5abc388608
parent d58f07f58a8230ee906b9af7d7a89ac876158ab6

Making timeouts configurable through Settings

Adding a global setting for timeouts used in retail demo mode.
Also renaming the protected intent ACTION_RESET_DEMO to reflect proper
owner package.

Bug: 29917613
Change-Id: I9a174503626ab28cceb5024a8e63d27612439b92

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 3c71dd9..8388f05 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -478,7 +478,7 @@
     <protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE" />
     <protected-broadcast android:name="com.android.server.pm.DISABLE_QUIET_MODE_AFTER_UNLOCK" />
 
-    <protected-broadcast android:name="com.android.server.am.ACTION_RESET_DEMO" />
+    <protected-broadcast android:name="com.android.server.retaildemo.ACTION_RESET_DEMO" />
 
     <!-- ====================================================================== -->
     <!--                          RUNTIME PERMISSIONS                           -->