OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Add an new internal DrawableContainer to handle animation scale == 0 case...
Tenghui Zhu [Wed, 24 Aug 2016 16:37:11 +0000 (16:37 +0000)]
Merge "Add an new internal DrawableContainer to handle animation scale == 0 case." into nyc-mr1-dev am: 3512b0001a
am: f286d846f0

Change-Id: Ib52cba508e4051fc4d846f7e670eb2deaf58da12

7 years agoAdd an new internal DrawableContainer to handle animation scale == 0 case. am: 0c03664fa6
Teng-Hui Zhu [Wed, 24 Aug 2016 16:36:30 +0000 (16:36 +0000)]
Add an new internal DrawableContainer to handle animation scale == 0 case. am: 0c03664fa6
am: 0bc9fa9896

Change-Id: I10fe7a99a8857ce76181c98da30287916dc7aab4

7 years agoMerge "Add an new internal DrawableContainer to handle animation scale == 0 case...
Tenghui Zhu [Wed, 24 Aug 2016 16:29:40 +0000 (16:29 +0000)]
Merge "Add an new internal DrawableContainer to handle animation scale == 0 case." into nyc-mr1-dev
am: 3512b0001a

Change-Id: Iac78966a4ff7d4d7bb6972a1624a7587b68c224e

7 years agoAdd an new internal DrawableContainer to handle animation scale == 0 case.
Teng-Hui Zhu [Wed, 24 Aug 2016 16:28:55 +0000 (16:28 +0000)]
Add an new internal DrawableContainer to handle animation scale == 0 case.
am: 0c03664fa6

Change-Id: I7feae01c6302e2942087c6dfe1948109467f1326

7 years agoMerge "Add an new internal DrawableContainer to handle animation scale == 0 case...
Tenghui Zhu [Wed, 24 Aug 2016 16:22:32 +0000 (16:22 +0000)]
Merge "Add an new internal DrawableContainer to handle animation scale == 0 case." into nyc-mr1-dev

7 years agoframeworks/base: add changes coming from aosp am: 29835cc56e
Sergio Giro [Wed, 24 Aug 2016 15:43:59 +0000 (15:43 +0000)]
frameworks/base: add changes coming from aosp am: 29835cc56e
am: 263820bb2c

Change-Id: Ifb8ea64e1dd24a75beafd29b0b61115c39b88fd1

7 years agoframeworks/base: add changes coming from aosp
Sergio Giro [Wed, 24 Aug 2016 15:39:00 +0000 (15:39 +0000)]
frameworks/base: add changes coming from aosp
am: 29835cc56e

Change-Id: Ia89b81f3d5c1d8a4d20280355bb9d27b655098d3

7 years agoframeworks/base: add changes coming from aosp
Sergio Giro [Wed, 24 Aug 2016 14:45:02 +0000 (15:45 +0100)]
frameworks/base: add changes coming from aosp

Corresponding to aosp changes:
https://android-review.googlesource.com/261231
https://android-review.googlesource.com/261194
https://android-review.googlesource.com/261211

Change-Id: I13caa90b7f97d5aa447050f89a5312d22db3d277

7 years agoMerge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev am: 4d826638ab
Rubin Xu [Wed, 24 Aug 2016 14:34:53 +0000 (14:34 +0000)]
Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev am: 4d826638ab
am: 50c5f4ac38

Change-Id: I0537a8602025fbb1193c3d9a864f2a4bb484cd35

7 years agoSet DeviceLockedForUser state synchronously am: 9201a30a95
Rubin Xu [Wed, 24 Aug 2016 14:34:45 +0000 (14:34 +0000)]
Set DeviceLockedForUser state synchronously am: 9201a30a95
am: 6b3c49d2b8

Change-Id: I41f4ec89bd742b1742a321f1e9445511e63451b5

7 years agoMerge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev
Rubin Xu [Wed, 24 Aug 2016 14:28:59 +0000 (14:28 +0000)]
Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev
am: 4d826638ab

Change-Id: If6fa13004de30cef2c528a5fcdc460ff39f850cc

7 years agoSet DeviceLockedForUser state synchronously
Rubin Xu [Wed, 24 Aug 2016 14:28:55 +0000 (14:28 +0000)]
Set DeviceLockedForUser state synchronously
am: 9201a30a95

Change-Id: Ia046cbf84df5db428d54df56d744ae8d6da5521a

7 years agoMerge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev
Rubin Xu [Wed, 24 Aug 2016 14:23:42 +0000 (14:23 +0000)]
Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev

7 years agoMerge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev am:...
Jaewan Kim [Wed, 24 Aug 2016 05:46:00 +0000 (05:46 +0000)]
Merge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev am: 473c683ca6
am: 09a7a7b9f8

Change-Id: I460a26a4f408c9bb8c056a69c303aba8762968b7

7 years agoMediaSessionService: Leave log for media key events am: 5e1476ecd7
Jaewan Kim [Wed, 24 Aug 2016 05:45:52 +0000 (05:45 +0000)]
MediaSessionService: Leave log for media key events am: 5e1476ecd7
am: ed3fd2743c

Change-Id: I5d529af33984fcad70ab70664d9029b7c87ad5f1

7 years agoMerge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev
Jaewan Kim [Wed, 24 Aug 2016 05:39:52 +0000 (05:39 +0000)]
Merge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev
am: 473c683ca6

Change-Id: Ieabb167fc67e4ea76dc52702eb88dac5f0667f10

7 years agoMediaSessionService: Leave log for media key events
Jaewan Kim [Wed, 24 Aug 2016 05:39:49 +0000 (05:39 +0000)]
MediaSessionService: Leave log for media key events
am: 5e1476ecd7

Change-Id: I2b3ea66e3429c953e2008e41d10333cddbbc60c0

7 years agoMerge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev
Jaewan Kim [Wed, 24 Aug 2016 05:34:26 +0000 (05:34 +0000)]
Merge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev

7 years agoMerge "ExifInterface: Make saveAttributes throw an exception before change" into...
Sungsoo Lim [Wed, 24 Aug 2016 02:31:17 +0000 (02:31 +0000)]
Merge "ExifInterface: Make saveAttributes throw an exception before change" into nyc-mr1-dev am: c23c2771de
am: 9b5106a438

Change-Id: Ica0b1c16ffe7094b5c4010dcaaa9f60fa6a02fb9

7 years agoExifInterface: Make saveAttributes throw an exception before change am: a8f9a075b1
Sungsoo [Wed, 24 Aug 2016 02:31:14 +0000 (02:31 +0000)]
ExifInterface: Make saveAttributes throw an exception before change am: a8f9a075b1
am: 6dfc7abaf9

Change-Id: Iecc3f1dcffd540f005312e8a301335ea02cd89b9

7 years agoMerge "Fixing issue with toasts not showing for guest users." into nyc-mr1-dev am...
Winson [Wed, 24 Aug 2016 02:28:38 +0000 (02:28 +0000)]
Merge "Fixing issue with toasts not showing for guest users." into nyc-mr1-dev am: e846b18d33
am: 1abd27f466

Change-Id: Ib4e9980c819879f7076724c5530ec871bb3a8ce9

7 years agoFixing issue with toasts not showing for guest users. am: 675c5d8e5a
Winson [Wed, 24 Aug 2016 02:28:35 +0000 (02:28 +0000)]
Fixing issue with toasts not showing for guest users. am: 675c5d8e5a
am: fcf8f8382b

Change-Id: I99fa2bef8e4e2a14d2d81c812ef8cd78e2caf453

7 years agoMerge "Don't use fullscreen theme for forced resizable info activity" into nyc-mr1...
Jorim Jaggi [Wed, 24 Aug 2016 02:28:31 +0000 (02:28 +0000)]
Merge "Don't use fullscreen theme for forced resizable info activity" into nyc-mr1-dev am: 6e370d35fe
am: 2bf085a3b4

Change-Id: Id090ce266a0a82c3940ff244ae6f0e7740291bfc

7 years agoDon't use fullscreen theme for forced resizable info activity am: 3f09052eb9
Jorim Jaggi [Wed, 24 Aug 2016 02:28:27 +0000 (02:28 +0000)]
Don't use fullscreen theme for forced resizable info activity am: 3f09052eb9
am: b0ba9599c8

Change-Id: I8ae9889acab0f32edeaa62d243dd38322bb712e0

7 years agoMerge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev am: 5a10360d7e
Jorim Jaggi [Wed, 24 Aug 2016 02:28:23 +0000 (02:28 +0000)]
Merge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev am: 5a10360d7e
am: 9a0d881e3c

Change-Id: I082c41d1214c396026e3e2386b70027b5eaeb211

7 years agoRemove swipe-up gesture from Tuner am: 3793aff806
Jorim Jaggi [Wed, 24 Aug 2016 02:22:29 +0000 (02:22 +0000)]
Remove swipe-up gesture from Tuner am: 3793aff806
am: 55f4b0e9be

Change-Id: I2068e5a4174348be0b2da4264b237e83ecdac249

7 years agoMerge "use directory timestamp during OTA" into nyc-mr1-dev am: f50ff35cea
Todd Kennedy [Wed, 24 Aug 2016 02:22:26 +0000 (02:22 +0000)]
Merge "use directory timestamp during OTA" into nyc-mr1-dev am: f50ff35cea
am: d2247b0724

Change-Id: Iacbb3f80fa9d7e60df65b70bd1c512f16979e609

7 years agouse directory timestamp during OTA am: 095d4125be
Todd Kennedy [Wed, 24 Aug 2016 02:22:22 +0000 (02:22 +0000)]
use directory timestamp during OTA am: 095d4125be
am: 9366047713

Change-Id: I7b94106395ccec00298a30f82447252e6252adb8

7 years agoMerge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev...
Justin Klaassen [Wed, 24 Aug 2016 02:22:18 +0000 (02:22 +0000)]
Merge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev am: ee36020457
am: d64ec9b709

Change-Id: Id3e20f8d474b7726493e841446e41a78630ba019

7 years agoImprove logging for NightDisplayService/TwilightService am: ec8837ae26
Justin Klaassen [Wed, 24 Aug 2016 02:22:14 +0000 (02:22 +0000)]
Improve logging for NightDisplayService/TwilightService am: ec8837ae26
am: 33b64cba51

Change-Id: I4d6c5d93831d383bf6a18d522468f773a19db7e0

7 years agoBump up preloading recents on boot up to user unlocked. am: c3eedd972d
Winson [Wed, 24 Aug 2016 02:12:13 +0000 (02:12 +0000)]
Bump up preloading recents on boot up to user unlocked. am: c3eedd972d
am: 3174f2931b

Change-Id: If01f9e61af46d32601c65949f4931418d170d2a7

7 years agoMerge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev am: 8664df3d76
Makoto Onuki [Wed, 24 Aug 2016 02:12:09 +0000 (02:12 +0000)]
Merge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev am: 8664df3d76
am: 311484cc4e

Change-Id: I3b008bdb7b2f9e9e042d7ace9fb0e440e665f250

7 years agoBackporting shortcut manager test utils to mr1 am: a49bafad6b
Makoto Onuki [Wed, 24 Aug 2016 02:11:05 +0000 (02:11 +0000)]
Backporting shortcut manager test utils to mr1 am: a49bafad6b
am: d76622fbc1

Change-Id: I70a85bdb9548a79ebf534867938ba5f740eecd7c

7 years agoMerge "Only sync adapters with access can see an account - framework" into nyc-mr1...
Svetoslav Ganov [Wed, 24 Aug 2016 02:09:20 +0000 (02:09 +0000)]
Merge "Only sync adapters with access can see an account - framework" into nyc-mr1-dev am: 0f7fe17983
am: 909bb94eb2

Change-Id: I312d0634582c3b3ad0a53ce31e6d28da02750c8f

7 years agoOnly sync adapters with access can see an account - framework am: 5cb2973495
Svetoslav Ganov [Wed, 24 Aug 2016 02:08:19 +0000 (02:08 +0000)]
Only sync adapters with access can see an account - framework am: 5cb2973495
am: 721402e75a

Change-Id: I361b009afa6c6e658157e6e04bf88096e8331fd0

7 years agoMerge "ExifInterface: Make saveAttributes throw an exception before change" into...
Sungsoo Lim [Wed, 24 Aug 2016 01:59:14 +0000 (01:59 +0000)]
Merge "ExifInterface: Make saveAttributes throw an exception before change" into nyc-mr1-dev
am: c23c2771de

Change-Id: Iddb3cf4b3f3e008b0a6296824e4c9931bd4c7650

7 years agoExifInterface: Make saveAttributes throw an exception before change
Sungsoo [Wed, 24 Aug 2016 01:59:11 +0000 (01:59 +0000)]
ExifInterface: Make saveAttributes throw an exception before change
am: a8f9a075b1

Change-Id: I06620c9f70fb8642311d1029242aa6e5ab3f3344

7 years agoMerge "ExifInterface: Make saveAttributes throw an exception before change" into...
Sungsoo Lim [Wed, 24 Aug 2016 01:53:19 +0000 (01:53 +0000)]
Merge "ExifInterface: Make saveAttributes throw an exception before change" into nyc-mr1-dev

7 years agoMerge "Fixing issue with toasts not showing for guest users." into nyc-mr1-dev
Winson [Wed, 24 Aug 2016 01:53:15 +0000 (01:53 +0000)]
Merge "Fixing issue with toasts not showing for guest users." into nyc-mr1-dev
am: e846b18d33

Change-Id: I652b6dc925dc9e63806c26c705a6503bbf6bdc01

7 years agoFixing issue with toasts not showing for guest users.
Winson [Wed, 24 Aug 2016 01:53:12 +0000 (01:53 +0000)]
Fixing issue with toasts not showing for guest users.
am: 675c5d8e5a

Change-Id: Icd495e4f6dd9f8c7e10d6e88c8839ee358b1e41a

7 years agoMerge "Fixing issue with toasts not showing for guest users." into nyc-mr1-dev
TreeHugger Robot [Wed, 24 Aug 2016 01:47:18 +0000 (01:47 +0000)]
Merge "Fixing issue with toasts not showing for guest users." into nyc-mr1-dev

7 years agoMerge "Don't use fullscreen theme for forced resizable info activity" into nyc-mr1-dev
Jorim Jaggi [Wed, 24 Aug 2016 01:36:40 +0000 (01:36 +0000)]
Merge "Don't use fullscreen theme for forced resizable info activity" into nyc-mr1-dev
am: 6e370d35fe

Change-Id: I5c5e5505d7580705dcd3fb5e2bffb61b2dbf421c

7 years agoDon't use fullscreen theme for forced resizable info activity
Jorim Jaggi [Wed, 24 Aug 2016 01:36:35 +0000 (01:36 +0000)]
Don't use fullscreen theme for forced resizable info activity
am: 3f09052eb9

Change-Id: I3a965a0037fe1c22559567d74ee3a4a8c41bafea

7 years agoMerge "Don't use fullscreen theme for forced resizable info activity" into nyc-mr1-dev
TreeHugger Robot [Wed, 24 Aug 2016 01:32:09 +0000 (01:32 +0000)]
Merge "Don't use fullscreen theme for forced resizable info activity" into nyc-mr1-dev

7 years agoMerge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev
Jorim Jaggi [Wed, 24 Aug 2016 01:26:46 +0000 (01:26 +0000)]
Merge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev
am: 5a10360d7e

Change-Id: I9afc277939d6cea0bc4a9cfea5dee10277b0ed74

7 years agoRemove swipe-up gesture from Tuner
Jorim Jaggi [Wed, 24 Aug 2016 01:26:40 +0000 (01:26 +0000)]
Remove swipe-up gesture from Tuner
am: 3793aff806

Change-Id: I601fdce7b6e88e30b2ccfdf55d84ed41ff1d5e36

7 years agoMediaSessionService: Leave log for media key events
Jaewan Kim [Tue, 19 Jul 2016 13:25:39 +0000 (22:25 +0900)]
MediaSessionService: Leave log for media key events

Bug: 30212915
Change-Id: I6eb523bbbce2292b6b51d538d82ef4d0a8ba23b3

7 years agoMerge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev
TreeHugger Robot [Wed, 24 Aug 2016 01:21:05 +0000 (01:21 +0000)]
Merge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev

7 years agoFixing issue with toasts not showing for guest users.
Winson [Wed, 24 Aug 2016 00:12:22 +0000 (17:12 -0700)]
Fixing issue with toasts not showing for guest users.

Bug: 30001278
Change-Id: I43269da8a6c41f4fec5923aafe5a624ec75ba651

7 years agoMerge "use directory timestamp during OTA" into nyc-mr1-dev
Todd Kennedy [Wed, 24 Aug 2016 00:14:41 +0000 (00:14 +0000)]
Merge "use directory timestamp during OTA" into nyc-mr1-dev
am: f50ff35cea

Change-Id: I83f00ad2efd14e778224df6c13ef2c4afdd05d35

7 years agouse directory timestamp during OTA
Todd Kennedy [Wed, 24 Aug 2016 00:14:37 +0000 (00:14 +0000)]
use directory timestamp during OTA
am: 095d4125be

Change-Id: I9c429b193f808181d2cec02c0caeda07058a35db

7 years agoMerge "use directory timestamp during OTA" into nyc-mr1-dev
TreeHugger Robot [Wed, 24 Aug 2016 00:09:18 +0000 (00:09 +0000)]
Merge "use directory timestamp during OTA" into nyc-mr1-dev

7 years agoMerge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev
Justin Klaassen [Wed, 24 Aug 2016 00:09:02 +0000 (00:09 +0000)]
Merge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev
am: ee36020457

Change-Id: Ic0348ec624d4e0d5be427fce1cbc300a3d3a93b3

7 years agoImprove logging for NightDisplayService/TwilightService
Justin Klaassen [Wed, 24 Aug 2016 00:09:00 +0000 (00:09 +0000)]
Improve logging for NightDisplayService/TwilightService
am: ec8837ae26

Change-Id: Id92024b32a49713bc45159dc9347397c359d9711

7 years agoMerge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev
TreeHugger Robot [Wed, 24 Aug 2016 00:04:40 +0000 (00:04 +0000)]
Merge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev

7 years agoBump up preloading recents on boot up to user unlocked.
Winson [Tue, 23 Aug 2016 23:58:33 +0000 (23:58 +0000)]
Bump up preloading recents on boot up to user unlocked.
am: c3eedd972d

Change-Id: Id7a6f3a04d98672219d7f9995665258a138de8e0

7 years agoBump up preloading recents on boot up to user unlocked.
Winson [Tue, 9 Aug 2016 21:51:24 +0000 (14:51 -0700)]
Bump up preloading recents on boot up to user unlocked.

- To fix b/29320695, we moved the initial recents preloading to boot
  completed.  However, that event happens fairly late in the boot
  sequence, and preloading can instead be done in response to user
  unlocked.

Bug: 29879478
Change-Id: I881bd9c4c3b91d73df4947bfd2cc55eb6e615d15

7 years agoMerge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev
Makoto Onuki [Tue, 23 Aug 2016 23:51:09 +0000 (23:51 +0000)]
Merge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev
am: 8664df3d76

Change-Id: I7abfe83f44599ff546034816e92b01a40a9f7a29

7 years agoBackporting shortcut manager test utils to mr1
Makoto Onuki [Tue, 23 Aug 2016 23:50:28 +0000 (23:50 +0000)]
Backporting shortcut manager test utils to mr1
am: a49bafad6b

Change-Id: I6d60195dcfa8d98a8b58ae5485761811ffe34152

7 years agoMerge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev
Makoto Onuki [Tue, 23 Aug 2016 23:44:03 +0000 (23:44 +0000)]
Merge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev

7 years agoMerge "Only sync adapters with access can see an account - framework" into nyc-mr1-dev
Svetoslav Ganov [Tue, 23 Aug 2016 23:35:24 +0000 (23:35 +0000)]
Merge "Only sync adapters with access can see an account - framework" into nyc-mr1-dev
am: 0f7fe17983

Change-Id: I9c141ec863c27db114bddd5e1ee7398ec7e69091

7 years agoOnly sync adapters with access can see an account - framework
Svetoslav Ganov [Tue, 23 Aug 2016 23:35:13 +0000 (23:35 +0000)]
Only sync adapters with access can see an account - framework
am: 5cb2973495

Change-Id: I615f02c04578fa23f182a3591419139071114aef

7 years agoMerge "Only sync adapters with access can see an account - framework" into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 23:26:47 +0000 (23:26 +0000)]
Merge "Only sync adapters with access can see an account - framework" into nyc-mr1-dev

7 years agoMerge "Merge "Added error handling to settings suggestions list" into nyc-mr1-dev...
Android Build Merger (Role) [Tue, 23 Aug 2016 23:10:08 +0000 (23:10 +0000)]
Merge "Merge "Added error handling to settings suggestions list" into nyc-mr1-dev am: 621dcdf9cd am: 1941584197" into nyc-mr1-dev-plus-aosp

7 years agoMerge "Added error handling to settings suggestions list am: 2197e8d6f5 am: a6e6feffe...
Android Build Merger (Role) [Tue, 23 Aug 2016 23:09:56 +0000 (23:09 +0000)]
Merge "Added error handling to settings suggestions list am: 2197e8d6f5 am: a6e6feffe6" into nyc-mr1-dev-plus-aosp

7 years agoMerge "Added error handling to settings suggestions list" into nyc-mr1-dev am: 621dcdf9cd
Salvador Martinez [Tue, 23 Aug 2016 23:09:17 +0000 (23:09 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-mr1-dev am: 621dcdf9cd
am: 1941584197

Change-Id: I34949cf675241a73d15b64718c7356c0bf3a2d7d

7 years agoAdded error handling to settings suggestions list am: 2197e8d6f5
Salvador Martinez [Tue, 23 Aug 2016 23:09:14 +0000 (23:09 +0000)]
Added error handling to settings suggestions list am: 2197e8d6f5
am: a6e6feffe6

Change-Id: Ia038629a47a212b2c4f5beb2eb367ffbfbbf6895

7 years agoresolve merge conflicts of 24e38ab to stage-aosp-master am: 621fb590e3
John Reck [Tue, 23 Aug 2016 23:08:32 +0000 (23:08 +0000)]
resolve merge conflicts of 24e38ab to stage-aosp-master am: 621fb590e3
am: f929ef6cbd

Change-Id: Ie7d5ff6858f95cf7725fa12df8d33420bc3954b2

7 years agoMerge "Added error handling to settings suggestions list" into nyc-mr1-dev
Salvador Martinez [Tue, 23 Aug 2016 23:02:03 +0000 (23:02 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-mr1-dev
am: 621dcdf9cd

Change-Id: Icdb19bcdbf888341e59afe3992d5a04030ed0ac7

7 years agoAdded error handling to settings suggestions list
Salvador Martinez [Tue, 23 Aug 2016 23:01:32 +0000 (23:01 +0000)]
Added error handling to settings suggestions list
am: 2197e8d6f5

Change-Id: I93d2f5363f702dbec76f34f5e121d3d3c9e01ac5

7 years agoresolve merge conflicts of 24e38ab to stage-aosp-master
John Reck [Tue, 23 Aug 2016 22:56:52 +0000 (22:56 +0000)]
resolve merge conflicts of 24e38ab to stage-aosp-master
am: 621fb590e3

Change-Id: Ia1b617a13012a8d475feb91bfbabb6ace264a29e

7 years agoMerge "Added error handling to settings suggestions list" into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 22:52:31 +0000 (22:52 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-mr1-dev

7 years agouse directory timestamp during OTA
Todd Kennedy [Tue, 23 Aug 2016 22:38:26 +0000 (15:38 -0700)]
use directory timestamp during OTA

Previously the timestamp was generated using the directory and not the
APK [see b/29575840 and b/29610181 as to why that's bad]. In MR1, the
timestamp was generated using the most recent time of any of the APK
files.

The timestamp discrepancy causes problems during OTA to N MR1. Most
apps are incorrectly marked as "changed" which means a full parse and
verification pass on all packages. This can be a very lengthy process.

Bug: 30930797
Change-Id: Iaef7b318e1c1effbd74d996f88cbf3d6e77736cd
Test: manually updated the platform and noticed that existing packages were marked as "not changed"

7 years agoMerge "Update light mode when battery saver changes" into nyc-mr1-dev am: 891411aaa5
Jorim Jaggi [Tue, 23 Aug 2016 22:40:26 +0000 (22:40 +0000)]
Merge "Update light mode when battery saver changes" into nyc-mr1-dev am: 891411aaa5
am: 594a4918f8

Change-Id: I7067b815ecbd8b90316f4db01e2db0a49d49614c

7 years agoUpdate light mode when battery saver changes am: 244a43ee6f
Jorim Jaggi [Tue, 23 Aug 2016 22:40:22 +0000 (22:40 +0000)]
Update light mode when battery saver changes am: 244a43ee6f
am: c9be359ad4

Change-Id: I7e5af1beb8151bd5c60132d70a7ce2420712b004

7 years agoMerge "Update light mode when battery saver changes" into nyc-mr1-dev
Jorim Jaggi [Tue, 23 Aug 2016 22:29:16 +0000 (22:29 +0000)]
Merge "Update light mode when battery saver changes" into nyc-mr1-dev
am: 891411aaa5

Change-Id: I90f2dc2ab69c60f31c3b88a128fa7542de9d9780

7 years agoUpdate light mode when battery saver changes
Jorim Jaggi [Tue, 23 Aug 2016 22:29:14 +0000 (22:29 +0000)]
Update light mode when battery saver changes
am: 244a43ee6f

Change-Id: Ifb0238a6690d06ec4abd7aa600763cfb6f607dc5

7 years agoImprove logging for NightDisplayService/TwilightService
Justin Klaassen [Tue, 23 Aug 2016 19:04:42 +0000 (12:04 -0700)]
Improve logging for NightDisplayService/TwilightService

Bug: 31037341
Change-Id: Id6e5ea55f2fed93f1afdd0f61028e3329c8a43c3
(cherry picked from commit 7fba39209065eeee8fc8e8e98c44c5fcc1ca275d)

7 years agoMerge "Update light mode when battery saver changes" into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 22:20:38 +0000 (22:20 +0000)]
Merge "Update light mode when battery saver changes" into nyc-mr1-dev

7 years agoresolve merge conflicts of 24e38ab to stage-aosp-master
John Reck [Tue, 23 Aug 2016 22:10:47 +0000 (15:10 -0700)]
resolve merge conflicts of 24e38ab to stage-aosp-master

Change-Id: I02db3eb317ccb182b563ec9350a116bd5de063b6

7 years agoOnly sync adapters with access can see an account - framework
Svetoslav Ganov [Tue, 12 Jul 2016 02:32:30 +0000 (19:32 -0700)]
Only sync adapters with access can see an account - framework

It was possible for a sync adapter without accounts access to
see the account which it is supposed to sync which can be used to
identify the user. This change ensures that only sync adapters
with account access can run (which results in seeing the account),
otherwise we involve the user to approve access only to this account.

A sync adapter can access an account if one of these is true:
 - it is signed as the authenticator for this account
 - has the GET_ACCOUNTS permission
 - has an auth token for the account
 - it is a preinstalled app (system or privileged)

The main thing we need to figure out is if the extra prompts
for giving access to a sync adapter to the account create too
much friction.

bug:28163381

Change-Id: Ie083bb681b5a2aed81ca5f6a062193a175fad77e

7 years agoMerge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev am: 50ff32c17f
Amith Yamasani [Tue, 23 Aug 2016 21:28:25 +0000 (21:28 +0000)]
Merge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev am: 50ff32c17f
am: 4b62110262

Change-Id: I277aabd654295050509266abc7461a4a2802b5b9

7 years agoDon't complain about sender of MASTER_CLEAR am: d8a55f6dd8
Amith Yamasani [Tue, 23 Aug 2016 21:28:22 +0000 (21:28 +0000)]
Don't complain about sender of MASTER_CLEAR am: d8a55f6dd8
am: 8b2adb1ee1

Change-Id: I40413fab0229bd4f0a2331ba8c467503632f88fb

7 years agoMerge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev
Amith Yamasani [Tue, 23 Aug 2016 21:22:50 +0000 (21:22 +0000)]
Merge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev
am: 50ff32c17f

Change-Id: I37f7e13d7974b32cb5487c78f492a6518ef9d4dc

7 years agoDon't complain about sender of MASTER_CLEAR
Amith Yamasani [Tue, 23 Aug 2016 21:22:48 +0000 (21:22 +0000)]
Don't complain about sender of MASTER_CLEAR
am: d8a55f6dd8

Change-Id: I4b66478a5c275bec2e47262c7cf8396c0f8d061e

7 years agoMerge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev
Amith Yamasani [Tue, 23 Aug 2016 21:19:03 +0000 (21:19 +0000)]
Merge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev

7 years agoMerge "Do not scan system apps unless after OTA" into nyc-mr1-dev am: 85c10342c1
Makoto Onuki [Tue, 23 Aug 2016 21:05:33 +0000 (21:05 +0000)]
Merge "Do not scan system apps unless after OTA" into nyc-mr1-dev am: 85c10342c1
am: 52e87790d2

Change-Id: Idfa9d861b28436e8be60e80da50be3c2f18acca7

7 years agoDo not scan system apps unless after OTA am: 3366328245
Makoto Onuki [Tue, 23 Aug 2016 21:05:29 +0000 (21:05 +0000)]
Do not scan system apps unless after OTA am: 3366328245
am: 140f6f5b8c

Change-Id: I0d37f55bb17feba629de041256ecaded338e5ca4

7 years agoMerge "Do not scan system apps unless after OTA" into nyc-mr1-dev
Makoto Onuki [Tue, 23 Aug 2016 20:59:10 +0000 (20:59 +0000)]
Merge "Do not scan system apps unless after OTA" into nyc-mr1-dev
am: 85c10342c1

Change-Id: Ic40a7b4c794029861ae1a1608c3022b9577e02c5

7 years agoDo not scan system apps unless after OTA
Makoto Onuki [Tue, 23 Aug 2016 20:59:07 +0000 (20:59 +0000)]
Do not scan system apps unless after OTA
am: 3366328245

Change-Id: I6e901e26f61cd4bad8ba2a1b927f34d141b0423d

7 years agoMerge "Do not scan system apps unless after OTA" into nyc-mr1-dev
Makoto Onuki [Tue, 23 Aug 2016 20:52:41 +0000 (20:52 +0000)]
Merge "Do not scan system apps unless after OTA" into nyc-mr1-dev

7 years agoRemove swipe-up gesture from Tuner
Jorim Jaggi [Mon, 22 Aug 2016 23:06:01 +0000 (16:06 -0700)]
Remove swipe-up gesture from Tuner

We can't do it anymore with the slippery flag, so remove the entry
in the tuner.

We'll clean up the code in master.

Change-Id: Ib3dee0c947e7925b5847f2edc4801495c659dfa5
Fixes: 30891575

7 years agoDon't use fullscreen theme for forced resizable info activity
Jorim Jaggi [Mon, 22 Aug 2016 23:16:43 +0000 (16:16 -0700)]
Don't use fullscreen theme for forced resizable info activity

Change-Id: I74b5443645dd532ff597d4a1773bbd5a38d71192
Fixes: 29278265

7 years agoMerge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when...
Adam Seaton [Tue, 23 Aug 2016 20:36:05 +0000 (20:36 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held." into nyc-dr1-dev am: 09c77dd2b1  -s ours am: 2c7e4d2345  -s ours
am: 9ea799541e  -s ours

Change-Id: I2717fe7b2361af6083eeacf5c1cf24198185e510

7 years agoDO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connec...
Tyler Gunn [Tue, 23 Aug 2016 20:36:02 +0000 (20:36 +0000)]
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held. am: d697c5dc9b  -s ours am: 9ea9bc0213  -s ours
am: ef59ba5472  -s ours

Change-Id: I1ada485c5a9a2a00075382a1e9e03e835a6ab74c

7 years agoMerge "Ambient: Pulse for every noisy notification exactly once" into nyc-dr1-dev...
Adrian Roos [Tue, 23 Aug 2016 20:35:58 +0000 (20:35 +0000)]
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-dr1-dev am: e1f32de996 am: a9b9b42e85
am: bd38788af6

Change-Id: Ie5a5e942f7f10e38807e8fd78db4f1205b2cedd0

7 years agoAmbient: Pulse for every noisy notification exactly once am: 97de2b2666 am: 7de22aa782
Adrian Roos [Tue, 23 Aug 2016 20:35:54 +0000 (20:35 +0000)]
Ambient: Pulse for every noisy notification exactly once am: 97de2b2666 am: 7de22aa782
am: 7e30202cb9

Change-Id: Ief68005c4d27214adc8134d727d699aa071191ce

7 years agoUpdate light mode when battery saver changes
Jorim Jaggi [Tue, 23 Aug 2016 20:28:04 +0000 (13:28 -0700)]
Update light mode when battery saver changes

Change-Id: I56b309222782d823d80a66c87d30eefed2ce5dc7
Fixes: 30150232

7 years agoMerge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when...
Adam Seaton [Tue, 23 Aug 2016 20:23:38 +0000 (20:23 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held." into nyc-dr1-dev am: 09c77dd2b1  -s ours
am: 2c7e4d2345  -s ours

Change-Id: Ife8b19d67eebd5834c3c6348d34dfd5262fe104c

7 years agoDO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connec...
Tyler Gunn [Tue, 23 Aug 2016 20:23:37 +0000 (20:23 +0000)]
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held. am: d697c5dc9b  -s ours
am: 9ea9bc0213  -s ours

Change-Id: I9dd9d03cccd3bd1f60d3af2517ec4f5f343d144d