Commit Graph

66246 Commits

Author SHA1 Message Date
Doris Liu
b53c9c1658 Merge \"Fix NPE for checking for whether animators should play together\" into nyc-mr1-dev
am: 7f9c189f06

Change-Id: I3ea0e652dd39dfffe279b4c2c0bb19d362eb91af
2016-06-24 17:53:06 +00:00
Doris Liu
7f9c189f06 Merge "Fix NPE for checking for whether animators should play together" into nyc-mr1-dev 2016-06-24 17:47:44 +00:00
Suprabh Shukla
5c451c08bc Merge \"Resetting some settings on starting a new demo session\" into nyc-mr1-dev
am: bb1fb395ca

Change-Id: Ic7b7520d4fa3cbfc79be49ded8a4ffd133d2b037
2016-06-24 16:36:55 +00:00
Amith Yamasani
bb1fb395ca Merge "Resetting some settings on starting a new demo session" into nyc-mr1-dev 2016-06-24 16:08:16 +00:00
Jorim Jaggi
5cd3e8396d Merge \"Fix WallpaperInfo API review\" into nyc-mr1-dev
am: e3f410cd59

Change-Id: Id4486196793d8cc82ee6b4a230bf357785a7842f
2016-06-24 01:32:49 +00:00
TreeHugger Robot
e3f410cd59 Merge "Fix WallpaperInfo API review" into nyc-mr1-dev 2016-06-24 01:24:01 +00:00
Suprabh Shukla
6472501f2e Resetting some settings on starting a new demo session
Muting ringer and media volume and turning off the flashlight
before starting a new session. Also, resetting the configuration of any
new demo user to the configuration of user 0 on the device. Moved
RetailDemoModeService and RetailDemoModeServiceInternal to more
appropriate new packages

Bug: 29519612
Change-Id: Ib65f89ce61afab2d2f1b2dd0c761f5d35a466181
2016-06-23 17:36:19 -07:00
Dmitri Plotnikov
89858c58af Merge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev
am: b1ca092db8

Change-Id: Icdb1cef5802c4d2b22292874ab3139a132fe7bd0
2016-06-24 00:32:44 +00:00
Dmitri Plotnikov
b1ca092db8 Merge "Unhiding DEVICE_NAME" into nyc-mr1-dev 2016-06-24 00:23:13 +00:00
Doris Liu
c470466d7c Fix NPE for checking for whether animators should play together
BUG: 29586505
Change-Id: Ic2a67d51d2ac8d5bfb11ed7773c7c7e413cc28c7
2016-06-24 00:01:39 +00:00
Jorim Jaggi
d136ba1664 Fix WallpaperInfo API review
Change-Id: I395b9617038450e6fa7a2f25bb55d6ae5f761015
Fixes: 29514598
2016-06-23 16:25:52 -07:00
Android Build Merger (Role)
10aee22fa1 Merge "Merge \\"fix bad contrast in table links by switching to normal table cells instead of headings.\\" into nyc-dev am: fd0eeb0379 am: 8c9bd9cb28" into nyc-mr1-dev-plus-aosp 2016-06-23 22:10:52 +00:00
Scott Main
afd1e8e259 Merge \\"fix bad contrast in table links by switching to normal table cells instead of headings.\\" into nyc-dev am: fd0eeb0379
am: 8c9bd9cb28

Change-Id: I557f9300ab69486a26f30bed5a244baee43319e7
2016-06-23 22:10:29 +00:00
Roozbeh Pournader
345f70e949 Merge \"Revert \"Revert \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\"\"\" into nyc-mr1-dev
am: 60882f517d

Change-Id: Ic0efed4a1c500fe021ee4244708bcda99f91f68e
2016-06-23 22:09:03 +00:00
smain@google.com
b8516f1029 Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
am: fd0eeb0379

Change-Id: I68b578ac0bb343dff66bcbc5bd5c652c93e9864f
2016-06-23 22:06:07 +00:00
smain@google.com
8c9bd9cb28 Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
am: fd0eeb0379

Change-Id: I3662c41848c20bfde90dcd453917e67f93693e74
2016-06-23 22:05:07 +00:00
Roozbeh Pournader
60882f517d Merge "Revert "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]""" into nyc-mr1-dev 2016-06-23 21:58:57 +00:00
Fyodor Kupolov
7ccd3241e0 Merge \"Print names of observers causing timeout\" into nyc-mr1-dev
am: 38d7897690

Change-Id: I45f06a2167e11733829c660c7baaae3996d8c7eb
2016-06-23 21:58:36 +00:00
Scott Main
fd0eeb0379 Merge "fix bad contrast in table links by switching to normal table cells instead of headings." into nyc-dev 2016-06-23 21:57:52 +00:00
Fyodor Kupolov
38d7897690 Merge "Print names of observers causing timeout" into nyc-mr1-dev 2016-06-23 21:49:05 +00:00
Chong Zhang
fac7476990 Merge \"Do not send unhandled system config changes to app\" into nyc-mr1-dev
am: 568507abf5

Change-Id: I4a711464f49c44f329e51d781dbe0eb4886d9c98
2016-06-23 21:41:12 +00:00
Chong Zhang
568507abf5 Merge "Do not send unhandled system config changes to app" into nyc-mr1-dev 2016-06-23 21:33:55 +00:00
Jason Monk
1ae5fbb187 Merge \\"QS: Hacks to fix bigger problems in TileService binding\\" into nyc-dev am: 1427bb3dc0
am: 955de27827

Change-Id: I54da9edd0593160ee38002cb2d97c64248a9ed96
2016-06-23 21:07:50 +00:00
Jason Monk
9981d94d54 Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev
am: 1427bb3dc0

Change-Id: I471055cbac21c09d23b60e6dab15bcc1cd1d6208
2016-06-23 21:02:13 +00:00
Jason Monk
955de27827 Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev
am: 1427bb3dc0

Change-Id: I9b5e57c302b6ae0f6accccf65b5e404a1ad780c0
2016-06-23 21:00:19 +00:00
Jason Monk
1427bb3dc0 Merge "QS: Hacks to fix bigger problems in TileService binding" into nyc-dev 2016-06-23 20:52:50 +00:00
Chong Zhang
4951f9d6f6 Do not send unhandled system config changes to app
If the config change is system-level and the app doesn't handle
it, it will definitely get relaunched and we don't need to call
onConfigurationChanged.

bug: 29367672
Change-Id: I3193d4b63d316295c9e73d42d000ab4eb5c1a6ad
2016-06-23 20:27:53 +00:00
Roozbeh Pournader
51a760a0f2 Revert "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]""
This reverts commit ad48dc18a5. sr-Latn is no
longer planned for MR1.

Bug: 29455508
Bug: 29601930
Change-Id: I1922ef649aab36be6ba3b94e3fd79a71a14acdff
2016-06-23 20:01:01 +00:00
smain@google.com
10e29b895e fix bad contrast in table links by switching to normal table cells instead of headings.
Change-Id: I91139ac2f01a9e099ffb5f65f4579a0b33ced5ab
2016-06-23 12:09:30 -07:00
Jason Monk
6edbefdd54 QS: Hacks to fix bigger problems in TileService binding
Bug: 29121793
Change-Id: I9cb8d8ee36ce5cc77ba3c11decb1b3a797fd7999
2016-06-23 14:59:22 -04:00
John Reck
bcc1353019 Merge \\"Remove FD from the right Looper\\" into nyc-dev am: db13dd41a9
am: c86a2e325e

Change-Id: I85ed478cf265fbc1857b08b89f32fb2aa358e284
2016-06-23 18:45:16 +00:00
John Reck
50e952fe74 Merge \"Remove FD from the right Looper\" into nyc-dev
am: db13dd41a9

Change-Id: I590fa2c47bcc90ee5b269fde5cdac9557206ed88
2016-06-23 18:44:16 +00:00
John Reck
c86a2e325e Merge \"Remove FD from the right Looper\" into nyc-dev
am: db13dd41a9

Change-Id: I451ef3649426d9b8ea1bf15e388d0efa82dae442
2016-06-23 18:39:44 +00:00
John Reck
db13dd41a9 Merge "Remove FD from the right Looper" into nyc-dev 2016-06-23 18:32:11 +00:00
Jeff Sharkey
68106fc9bb Merge \\"When uninstalling, only kill the requested user.\\" into nyc-dev am: 060d5a0e0a
am: eaa1c9ae42

Change-Id: Ifb9552c07ed4a055908e8c2e118eec2ff6ae4640
2016-06-23 18:21:59 +00:00
Jeff Sharkey
803a316d6e Merge \"When uninstalling, only kill the requested user.\" into nyc-dev
am: 060d5a0e0a

Change-Id: I25a7bffc2c5f414fe326963c028000eaa492f540
2016-06-23 18:16:45 +00:00
Jeff Sharkey
eaa1c9ae42 Merge \"When uninstalling, only kill the requested user.\" into nyc-dev
am: 060d5a0e0a

Change-Id: I3975462d7f027cc4fd449c56ba0c5f6442369a1b
2016-06-23 18:15:27 +00:00
Fyodor Kupolov
0b77ef9f51 Print names of observers causing timeout
Pass and store name in registerUserSwitchObserver and later print names of
observers causing timeout.

Bug: 29039588
Change-Id: I09c4bcc986168a07f5e20ad0f38667b783332288
2016-06-23 11:07:56 -07:00
TreeHugger Robot
060d5a0e0a Merge "When uninstalling, only kill the requested user." into nyc-dev 2016-06-23 18:03:27 +00:00
John Reck
ac04f4e69a Remove FD from the right Looper
Bug: 29586513

Also gives BackdropFrameRenderer a direct-destroy
of Choreographer since it's hammering on new Threads
and we don't want to wait for the GC to release
FDs.

Change-Id: Id2ec0af2ee4d5304961c4ab87a104ccb92f35fc2
2016-06-23 11:00:00 -07:00
Chris Manton
8bfefbbb53 Merge \"Add global settings for cell radio state\" into nyc-mr1-dev
am: d4ac4c7786

Change-Id: I5698d08dcc6854ceffb08debecf3fa443750fab0
2016-06-23 16:56:04 +00:00
Chris Manton
d4ac4c7786 Merge "Add global settings for cell radio state" into nyc-mr1-dev 2016-06-23 16:42:16 +00:00
Jeff Sharkey
85f449eaba When uninstalling, only kill the requested user.
When an app is being uninstalled for a specific user, only kill the
app under that user; leave the app running under other users.

Bug: 28875343
Change-Id: Ie60753cfd22df10a2b17d8c3732b6f19d2fe1fb9
2016-06-23 10:15:17 -06:00
Greg Kaiser
15ad0dacbc Merge \\"Sensor: Make getId() more varied\\" into nyc-dev am: 94b61cb340
am: 72c538707c

Change-Id: Ied341984f903d341544be1bb0bf212a6ca34e059
2016-06-23 03:37:58 +00:00
Peng Xu
0ad55d5769 Merge \"Sensor: Make getId() more varied\" into nyc-dev
am: 94b61cb340

Change-Id: I896ed5531533d55bd1ed3f2e3f21d21be04a1f5f
2016-06-23 03:32:46 +00:00
Peng Xu
72c538707c Merge \"Sensor: Make getId() more varied\" into nyc-dev
am: 94b61cb340

Change-Id: I8803994892af96c0defc5eda5e9a806ce7ec1bc9
2016-06-23 03:32:46 +00:00
Greg Kaiser
94b61cb340 Merge "Sensor: Make getId() more varied" into nyc-dev 2016-06-23 03:25:46 +00:00
Dianne Hackborn
569b988e22 Merge \\"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\\" into nyc-dev am: 576e6d27bd
am: c7ebca2a36

Change-Id: I3cc1de9010c77d1de0f36e6ad164ff107d176cbe
2016-06-23 03:19:32 +00:00
Dianne Hackborn
a8816eaf0e Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
am: 576e6d27bd

Change-Id: Iaf58242c587cbfbc5a98a8083f29a9c7d6b6b940
2016-06-23 03:10:16 +00:00
Dianne Hackborn
c7ebca2a36 Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
am: 576e6d27bd

Change-Id: Ib4589d04fa8c157a51ccc87508969d5d93788242
2016-06-23 03:09:56 +00:00