Justin Klaassen
029c2f4e3f
Merge \\"Add Night display feature\\" into nyc-mr1-dev am: 76262b8e14
...
am: 1228803cde
Change-Id: I855bf48a271b15f671957b1451caab24d08d8293
2016-07-08 21:46:23 +00:00
Justin Klaassen
1228803cde
Merge \"Add Night display feature\" into nyc-mr1-dev
...
am: 76262b8e14
Change-Id: I03912016390820f61fb515b1f206edd9bfea9ccf
2016-07-08 21:15:35 +00:00
Justin Klaassen
911e88939c
Add Night display feature
...
Bug: 28615069
Tints the display at night automatically according to your schedule or
using the sunrise/sunset corresponding to your current location.
Change-Id: Ie56b4eed88cc2fcbae88002492b1edad5820b6b1
2016-07-08 11:47:50 -07:00
Andreas Gampe
8f4731db63
Merge \\"Revert \\"Frameworks/base: Refactor UserHandle and Environment a bit\\"\\" into nyc-mr1-dev am: 56177bf81b
...
am: 5c1dc014ca
Change-Id: Ia51a5349ea826ca56ec0c5f8baf1c1afac7c6b81
2016-07-08 18:27:10 +00:00
Andreas Gampe
5c1dc014ca
Merge \"Revert \"Frameworks/base: Refactor UserHandle and Environment a bit\"\" into nyc-mr1-dev
...
am: 56177bf81b
Change-Id: I7ee938b31784d093680783c1988a68cc803cce3f
2016-07-08 18:19:33 +00:00
Andreas Gampe
56177bf81b
Merge "Revert "Frameworks/base: Refactor UserHandle and Environment a bit"" into nyc-mr1-dev
2016-07-08 18:09:54 +00:00
Suprabh Shukla
8a6b090fd4
Merge \\"Making timeouts configurable through Settings\\" into nyc-mr1-dev am: 33fa5dfa1d
...
am: 087d33febf
Change-Id: If1bb99b356d4b6fdf3471e1ccccc2c6ebf8ace43
2016-07-08 14:52:26 +00:00
Suprabh Shukla
087d33febf
Merge \"Making timeouts configurable through Settings\" into nyc-mr1-dev
...
am: 33fa5dfa1d
Change-Id: Ife69e438d83ddfb75433f92c6c5521ae4c3f82cc
2016-07-08 14:44:53 +00:00
TreeHugger Robot
33fa5dfa1d
Merge "Making timeouts configurable through Settings" into nyc-mr1-dev
2016-07-08 14:36:34 +00:00
Andreas Gampe
d281b4204a
Revert "Frameworks/base: Refactor UserHandle and Environment a bit"
...
Breaks monkey in root mode.
This reverts commit 6e16714c68 .
Bug: 29338430
Change-Id: I238f89dad77d7dcae6d02eccbda52eb9c6c6466c
2016-07-08 03:50:27 +00:00
Jim Miller
32d9ae1867
Merge \\"Fix bug with launching home activity from LockSettingsService\\" into nyc-mr1-dev am: 49fd320574
...
am: 7d5389bd07
Change-Id: I93dd8dd06d447b6d5401b7af8fc18b6345ce03b1
2016-07-07 22:45:58 +00:00
Jim Miller
7d5389bd07
Merge \"Fix bug with launching home activity from LockSettingsService\" into nyc-mr1-dev
...
am: 49fd320574
Change-Id: Id050bad455a77ecc6523e8f0d5363668677f6945
2016-07-07 22:38:27 +00:00
TreeHugger Robot
49fd320574
Merge "Fix bug with launching home activity from LockSettingsService" into nyc-mr1-dev
2016-07-07 22:32:10 +00:00
Suprabh Shukla
dbbc7af063
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
2016-07-07 14:12:14 -07:00
Jeff Sharkey
b1a52734af
Merge \\"Suppress PRE_BOOT notifications for some profiles.\\" into nyc-mr1-dev am: 99f70388ff
...
am: 7ca3706ebd
Change-Id: I7e5dc6ca7d01f4fb6345c13a8780eb29b058a685
2016-07-07 20:59:19 +00:00
Tim Murray
aa1735370b
Merge changes from topic \\'fifo\\' into nyc-mr1-dev am: a96d445aef
...
am: 03b34e402c
Change-Id: If3104889f659aef9a6d7035e18ab839544c9ecb3
2016-07-07 20:59:09 +00:00
Jeff Sharkey
7ca3706ebd
Merge \"Suppress PRE_BOOT notifications for some profiles.\" into nyc-mr1-dev
...
am: 99f70388ff
Change-Id: I977d5e4073ce57809ffb2b2e324b133c52341c4f
2016-07-07 20:48:43 +00:00
Tim Murray
03b34e402c
Merge changes from topic \'fifo\' into nyc-mr1-dev
...
am: a96d445aef
Change-Id: If4a5c3f65cb611aecf82ad49ad6d992f098cbfb1
2016-07-07 20:48:27 +00:00
TreeHugger Robot
99f70388ff
Merge "Suppress PRE_BOOT notifications for some profiles." into nyc-mr1-dev
2016-07-07 20:31:38 +00:00
Tim Murray
a96d445aef
Merge changes from topic 'fifo' into nyc-mr1-dev
...
* changes:
Add new mode for SCHED_FIFO on UI and RenderThreads.
Add isThreadInProcess.
2016-07-07 20:29:24 +00:00
Jeff Sharkey
5c1d5461c9
Merge \\"Remove \\"starting apps\\" boot message.\\" into nyc-mr1-dev am: bb2d9ab98e
...
am: cb2dce0352
Change-Id: Ieee93cccfb67ff3e9f28ed76813bc789208492db
2016-07-07 19:56:13 +00:00
Tim Murray
33eb07f575
Add new mode for SCHED_FIFO on UI and RenderThreads.
...
Add a new mode, controlled by sys.use_fifo_ui property, that enables the
top app's UI and RenderThread to be SCHED_FIFO. This eliminates almost
all jank due to scheduling competition with non-UI critical
threads. This mode may not be suitable for all devices.
bug 24503801
Change-Id: I7b8a31830ad80f7efa00236928d5476998ed4e00
2016-07-07 12:55:31 -07:00
Jeff Sharkey
cb2dce0352
Merge \"Remove \"starting apps\" boot message.\" into nyc-mr1-dev
...
am: bb2d9ab98e
Change-Id: Ie4b072d38eaa281b6292ac70eb366734013c907d
2016-07-07 19:49:32 +00:00
Philip Cuadra
66f496bdd3
Merge \\"Make pinning files async in a background thread\\" into nyc-mr1-dev am: f0df804e0a
...
am: 168050799c
Change-Id: I7c2ed1f0e370bfdf30de4ab52cd3948d9b8f2791
2016-07-07 19:49:20 +00:00
Annie Chin
f0045c93d8
Merge \\"Move voice interaction callback list to VoiceInteractionManagerService\\" into nyc-mr1-dev am: b91a5e7431
...
am: e5e1ea3a66
Change-Id: Ibe8e52e757e7bf9236060e427d414de9be229a90
2016-07-07 19:49:16 +00:00
Philip Cuadra
168050799c
Merge \"Make pinning files async in a background thread\" into nyc-mr1-dev
...
am: f0df804e0a
Change-Id: Ic32e9e9d9260c18365c29f12cb60ad67a3590a47
2016-07-07 19:42:15 +00:00
Annie Chin
e5e1ea3a66
Merge \"Move voice interaction callback list to VoiceInteractionManagerService\" into nyc-mr1-dev
...
am: b91a5e7431
Change-Id: I5fdf69335aaf3dd6ee77753b4f3cc554e1a0342c
2016-07-07 19:42:12 +00:00
TreeHugger Robot
bb2d9ab98e
Merge "Remove "starting apps" boot message." into nyc-mr1-dev
2016-07-07 19:37:24 +00:00
TreeHugger Robot
f0df804e0a
Merge "Make pinning files async in a background thread" into nyc-mr1-dev
2016-07-07 19:35:28 +00:00
Annie Chin
b91a5e7431
Merge "Move voice interaction callback list to VoiceInteractionManagerService" into nyc-mr1-dev
2016-07-07 19:30:42 +00:00
Annie Chin
d953ab6fdf
Move voice interaction callback list to VoiceInteractionManagerService
...
Bug: 30005941
Change-Id: I23b3bba8b4525068b0f032d5ca908c0f1d181558
2016-07-07 12:00:03 -07:00
Jeff Sharkey
24d949138f
Suppress PRE_BOOT notifications for some profiles.
...
When a profile is unlocked as a side effect of it's parent user being
unlocked, it's confusing to see two sets of identical notifications,
so suppress the set belonging to the profile.
Profile notifications are still shown when the profile has a separate
authentication challenge.
Bug: 29931646
Change-Id: Id8d621451996c9e2f159560894596292ceb00f8d
2016-07-07 12:48:43 -06:00
Jeff Sharkey
7380c321ad
Remove "starting apps" boot message.
...
The "starting apps" message is only shown for a short period of time
before we show the lock screen. Recent boot animations now have a
spin down phase which is just long enough to result in us flashing
this message for a very short period of time, which looks janky.
To avoid the janky behavior, remove this message altogether. Other
boot messages for dexopt'ing after an OTA remain intact.
Also fix security bug that would allow any app to show a message.
Bug: 29367890
Change-Id: I77bb65acbe0e5afb4033dc6b83e533e665dce690
2016-07-07 12:13:57 -06:00
Fyodor Kupolov
3f5161c625
Merge \\"Install preloaded apps into the demo user\\" into nyc-mr1-dev am: c77a2be407
...
am: 9b9f2013f4
Change-Id: I0292062b3f4f581f992101ca2c9112af6cad7c2b
2016-07-07 18:13:01 +00:00
Annie Chin
3aadb251be
Merge \\"Add a null check for mImpl.\\" into nyc-mr1-dev am: 5a4cfd36c2
...
am: 567be59cb4
Change-Id: Ib84725d14d7b0adbc0e26d67648a997f827a32cd
2016-07-07 18:12:57 +00:00
Fyodor Kupolov
9b9f2013f4
Merge \"Install preloaded apps into the demo user\" into nyc-mr1-dev
...
am: c77a2be407
Change-Id: Ib762cc51c0e56b9440545b48fe2d11208abfd890
2016-07-07 18:05:50 +00:00
Annie Chin
567be59cb4
Merge \"Add a null check for mImpl.\" into nyc-mr1-dev
...
am: 5a4cfd36c2
Change-Id: I26403fba055ca356ed69b599525dc7b6cf795b61
2016-07-07 18:05:45 +00:00
Fyodor Kupolov
c77a2be407
Merge "Install preloaded apps into the demo user" into nyc-mr1-dev
2016-07-07 18:00:54 +00:00
Philip Cuadra
a95cea04d5
Make pinning files async in a background thread
...
Make the actual pinning of files be async in the system server background thread.
There's no need to block system_server from doing useful work on the ui
thread while the files are pinned.
bug 28251566
Change-Id: I905c165533692979ac179e987216378210396e75
2016-07-07 10:57:44 -07:00
Jeff Sharkey
7a1f2cbb4f
Merge \\"Snapshot RemoteViews before releasing lock.\\" into nyc-mr1-dev am: ffc0d5153c
...
am: 18d0841650
Change-Id: Iad6d527d6e0a81c127b7836e231044aeb40f065c
2016-07-07 17:57:00 +00:00
Jeff Sharkey
18d0841650
Merge \"Snapshot RemoteViews before releasing lock.\" into nyc-mr1-dev
...
am: ffc0d5153c
Change-Id: I5c69b1d676d20a9d339a2dea635f07ab2a319638
2016-07-07 17:49:36 +00:00
Annie Chin
5a4cfd36c2
Merge "Add a null check for mImpl." into nyc-mr1-dev
2016-07-07 17:44:05 +00:00
Jeff Sharkey
ffc0d5153c
Merge "Snapshot RemoteViews before releasing lock." into nyc-mr1-dev
2016-07-07 17:36:52 +00:00
Annie Chin
2045bdd958
Add a null check for mImpl.
...
Bug: 30005941
Change-Id: I1212aa66be71b7ee0e990596272a33fa7530770f
2016-07-07 10:22:34 -07:00
Shibin George
084c4d73e7
Merge \\\\"Resolve deadlock between ActivityManagerService and PowerManagerService\\\\" am: 06561db207 am: 2c565826ba am: 26a0b16da8
...
am: 43e8af64c2
Change-Id: I9c261e2c4223069f8cfa8d16a5e96babc4522af0
2016-07-07 15:47:33 +00:00
Shibin George
43e8af64c2
Merge \\\"Resolve deadlock between ActivityManagerService and PowerManagerService\\\" am: 06561db207 am: 2c565826ba
...
am: 26a0b16da8
Change-Id: Ib90892556fde2bf8c53a7074b5d2702059adff65
2016-07-07 15:41:48 +00:00
Shibin George
26a0b16da8
Merge \\"Resolve deadlock between ActivityManagerService and PowerManagerService\\" am: 06561db207
...
am: 2c565826ba
Change-Id: I875f9f1ed5f6ab82c85ab35e7a24737d08aa3365
2016-07-07 15:36:46 +00:00
Shibin George
2c565826ba
Merge \"Resolve deadlock between ActivityManagerService and PowerManagerService\"
...
am: 06561db207
Change-Id: I7f78cf1ef0c490aceb527dbc82228d00fae2f7e4
2016-07-07 15:31:16 +00:00
Shibin George
43f5de0125
Resolve deadlock between ActivityManagerService and PowerManagerService
...
ActivityManagerService lock and PowerManagerService.mLock can
be acquired in different threads in different orders.
registerReceiver() here tries to acquire ActivityManagerService
internally while holding mLock. A particular call from
WindowManagerService acquires these locks in reverse order.
This deadlock can be resolved by moving registerReceiver()
to another thread.
https://code.google.com/p/android/issues/detail?id=215254
Change-Id: I12cd610e61f212a3fb5e441f2c7a557c90afbda4
Signed-off-by: Shibin George <shibing@codeaurora.org >
2016-07-07 19:45:35 +05:30
Hugo Benichi
219d9ba4fa
Merge \\"IpConn metrics: distinguish NUD_FAILED answers\\" into nyc-mr1-dev am: 42e608527a
...
am: 99b36c8b4f
Change-Id: Iade155a1941674edf642e99bd506d1676b67ab42
2016-07-07 13:17:27 +00:00