OSDN Git Service
Chris Craik [Fri, 13 Jan 2017 03:17:19 +0000 (19:17 -0800)]
Support shadows and reordering in ViewOverlay
Bug:
32726440
Test: manual
Change-Id: Ic5d7efdee5a493b7768b9db8150f65f97b3f0a64
Alain Vongsouvanh [Fri, 6 Jan 2017 17:41:37 +0000 (17:41 +0000)]
bools: fix use_lock_pattern_drawable javadoc.
am:
c4046b5542
Change-Id: Ifd50a1780a232d3902e5a232c2b3445aeb6db178
Alain Vongsouvanh [Fri, 6 Jan 2017 06:54:07 +0000 (22:54 -0800)]
bools: fix use_lock_pattern_drawable javadoc.
Change-Id: If135544edb499ee64117bf81c6e3d0eebbfcff00
Alain Vongsouvanh [Thu, 5 Jan 2017 19:45:02 +0000 (19:45 +0000)]
widget: Adding support for custom LockPatternView.
am:
2fda2ce159
Change-Id: Ib0d53bd7258f784dc3cb0661757b7c6d4979007f
TreeHugger Robot [Thu, 5 Jan 2017 19:33:44 +0000 (19:33 +0000)]
Merge "Add logging for task view thumbnail state." into nyc-mr2-dev
Alain Vongsouvanh [Fri, 18 Nov 2016 21:27:16 +0000 (13:27 -0800)]
widget: Adding support for custom LockPatternView.
OEMs can overlay the default 9 dots by providing two drawables that represent
those dots:
* lockscreen_notselected: asset to display when a cell has not been selected.
* lockscreen_selected: asset to display when a cell has been selected.
BUG:
33755663
Change-Id: Ic595b01f5e1321696b7a3feb0ff73c1acccfb942
TreeHugger Robot [Thu, 5 Jan 2017 10:08:41 +0000 (10:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 5 Jan 2017 10:06:44 +0000 (10:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 5 Jan 2017 08:27:04 +0000 (00:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic18109adbc1f4e2e3f8bf15aa6d5cf0cb703b601
Auto-generated-cl: translation import
Bill Yi [Thu, 5 Jan 2017 08:18:30 +0000 (00:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia63b58c348cd9978df4b800cdff5926ec9f487fa
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 5 Jan 2017 03:00:56 +0000 (03:00 +0000)]
Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev
* changes:
Added alert icon to high temp dialog.
Add VR mode check for thermal notification
Show notif when device reaches throttling temp
Andrew Sapperstein [Wed, 4 Jan 2017 19:25:20 +0000 (11:25 -0800)]
Added alert icon to high temp dialog.
Test: manual
Bug:
30995038
Change-Id: I966294c5fb0b8297b2f336102996291f66c08d2c
(cherry picked from commit
e26dc3d194f87ab3fbfdd5a843109b2f4b248383)
Andrew Sapperstein [Mon, 19 Dec 2016 22:36:33 +0000 (14:36 -0800)]
Add VR mode check for thermal notification
When in VR mode, don't show the high temp notification
since VR shows its own notification.
Test: manual
Bug:
30995038
Change-Id: I845480d968a9b0da9997f035875885bc261c577a
(cherry picked from commit
65d8a5fc73aac05633d42d7161ca38151aa5f675)
Andrew Sapperstein [Wed, 14 Dec 2016 23:39:20 +0000 (15:39 -0800)]
Show notif when device reaches throttling temp
Adds logic to SystemUI that shows a notification alerting the user
that their phone has reached a certain temperature and has throttled
itself in order to cool down.
The logic is controlled by a configuration resource:
R.bool.config_showTemperatureWarning. If false, no action is taken.
When true, PowerUI checks every 30 seconds if the current temp of
HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN is greater than
the throttling temp of HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN.
If any one of the temperatures returned is greater, a notification is shown.
Clicking on the notification will show a dialog explaining more details
about what the device is doing in response to the high temperature.
The notification will disappear once the temperature drops below
the throttling temperature.
In order to check the temperature in SystemUI, HardwarePropertiesManager
has been updated to also allow any calls made by callers holding the
signature-level DEVICE_POWER permission.
Test: runtest systemui
Bug:
30995038
Change-Id: I1b3f122341911c68e90c8a49ad35267ac382b356
(cherry picked from commit
b7caf1d06d5e4ef21cadcc6a68d4b4c4552fb7bc)
Julius D'souza [Wed, 4 Jan 2017 23:05:45 +0000 (23:05 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
am:
b60eb1a854
Change-Id: I86ef53eec2bbeff07c52e079e925719c3923941c
Julius D'souza [Wed, 4 Jan 2017 23:05:41 +0000 (23:05 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode.
am:
bbfdf7ad23
Change-Id: Ic6b72d6b72df516d4cec3b7a38e12366f7e334a1
Julius D'souza [Wed, 4 Jan 2017 22:59:57 +0000 (22:59 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
TreeHugger Robot [Wed, 4 Jan 2017 18:54:05 +0000 (18:54 +0000)]
Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev
Makoto Onuki [Thu, 15 Dec 2016 22:26:55 +0000 (14:26 -0800)]
Get account features before taking lock (cherry-pick from master)
Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.AccountCheckHostSideTest
* without having Id49f2bd5dfa80ecf35b3a23c789100ade38c2656 *
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Bug:
33481725
Change-Id: Ie2fe9aea87d1a7167581f4cd74ae063ef24a4567
Merged-in: I1e4dd9701a76ca366f86fdaf2fc6c282e9dbe5c1
Kevin Hufnagle [Wed, 4 Jan 2017 01:45:22 +0000 (01:45 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d
am:
63d1963345
Change-Id: Ie101eda01c3b772c0944c56cfede1514acadf1e1
Kevin Hufnagle [Wed, 4 Jan 2017 01:41:25 +0000 (01:41 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0
am:
fb99d1450d
Change-Id: Ibe527fb777ca3975fed67a951f2ddb8f2b81a833
Kevin Hufnagle [Wed, 4 Jan 2017 01:37:00 +0000 (01:37 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7
am:
d7c1e9bcd0
Change-Id: I7f9ce1b661f8defca2918eece234a9c26d5f08a3
Kevin Hufnagle [Wed, 4 Jan 2017 01:33:39 +0000 (01:33 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555
am:
d99f3b7214
Change-Id: I9a86dda9da8d525a23af69817044453fdf083ee4
Kevin Hufnagle [Wed, 4 Jan 2017 01:32:53 +0000 (01:32 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2
am:
01e3564a0d
Change-Id: Ic1454c9328a54777ba21cdee438e8d1bf91d5130
Kevin Hufnagle [Wed, 4 Jan 2017 01:32:24 +0000 (01:32 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50
am:
c32df53fc7
Change-Id: Ib2ac681a13b8d3b80feba803f25fdc8dbdcfe4f9
Kevin Hufnagle [Wed, 4 Jan 2017 01:29:30 +0000 (01:29 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc
am:
b7c9651555
Change-Id: I8c06b2b162ca5837ba9157ef91bb5a8d1489e36a
Kevin Hufnagle [Wed, 4 Jan 2017 01:28:19 +0000 (01:28 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38
am:
4418907d50
Change-Id: I486f53410a427f373daec719bac522289d812e7a
Kevin Hufnagle [Wed, 4 Jan 2017 01:28:17 +0000 (01:28 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85
am:
1c85b504e2
Change-Id: Iabd407dce1b3f01da5bbbd576536d0b77415d300
Kevin Hufnagle [Wed, 4 Jan 2017 01:25:12 +0000 (01:25 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5
am:
2ff9c02bdc
Change-Id: I930313b754635e07b190793c3b79de39b71b6b8a
Kevin Hufnagle [Wed, 4 Jan 2017 01:24:24 +0000 (01:24 +0000)]
docs: Added descriptions of IAB subscription-specific settings.
am:
145b377b38
Change-Id: I1b7a0885f613beb9b7baba8a6b35b59f00989ff3
Kevin Hufnagle [Wed, 4 Jan 2017 01:24:23 +0000 (01:24 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef
am:
c8ccc66e85
Change-Id: Id17c38ec7f6b85bcbfaaf676bf3a2f1414fca893
Kevin Hufnagle [Wed, 4 Jan 2017 01:18:51 +0000 (01:18 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
am:
dbe9b81ef5
Change-Id: Ie08ac386f441b16451538e21dcc8d5e5052258b0
Kevin Hufnagle [Wed, 4 Jan 2017 01:18:47 +0000 (01:18 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs
am:
98a11580ef
Change-Id: I2c44d24b772d3df80dabab418875a1e9842aebbf
Kevin Hufnagle [Wed, 4 Jan 2017 01:14:21 +0000 (01:14 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
Adrian Roos [Wed, 4 Jan 2017 00:01:04 +0000 (00:01 +0000)]
Merge "QS - Fix race condition in accessibility" into nyc-mr2-dev
Winson Chung [Tue, 3 Jan 2017 20:37:08 +0000 (12:37 -0800)]
Add logging for task view thumbnail state.
Test: adb shell dumpsys activity com.android.systemui
Bug:
32735667
Change-Id: Ieb06b1c11f833f7489d1d4994e634efea4227db2
Marie Janssen [Wed, 28 Dec 2016 22:13:21 +0000 (14:13 -0800)]
Bluetooth: track enabling in dumpsys
Move basic state dumpsys to here from AdapterService.
Track which apps are enabling and disabling Bluetooth, including BLE
apps, and show the apps in the dumpsys logs.
Test: start phone and enable/disable, take bug report
Bug:
33692282
Change-Id: I6ea62ebdcfd7873d0be1bb5c5c520bbce3737a40
(cherry picked from commit
5980456040217f330289e3fa59df4efaafb1c6c5)
Ivan Podogov [Tue, 3 Jan 2017 11:08:32 +0000 (11:08 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
am:
34624a5d83
Change-Id: If251197924b6f2f7b1970c614b5ceccc70edef4a
Ivan Podogov [Tue, 3 Jan 2017 11:08:29 +0000 (11:08 +0000)]
In permission review mode, always request user's consent to toggle BT.
am:
d2d32b1f32
Change-Id: I89a4c24cf0bd4154ca87f04e41b2cc64c49b39b2
Ivan Podogov [Tue, 3 Jan 2017 11:00:49 +0000 (11:00 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev
TreeHugger Robot [Fri, 30 Dec 2016 10:20:00 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 30 Dec 2016 10:19:34 +0000 (10:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Fri, 30 Dec 2016 05:29:31 +0000 (21:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iaff41f85806a9f7041ddb069130afc741300151a
Auto-generated-cl: translation import
Bill Yi [Fri, 30 Dec 2016 05:20:35 +0000 (21:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ied8ca4b5bbae1d9092a6df5acade12feb7d25517
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 30 Dec 2016 00:35:33 +0000 (00:35 +0000)]
Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev
Charles He [Thu, 29 Dec 2016 11:20:16 +0000 (11:20 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b am:
5c74a1e9bb am:
1d84f619bf am:
0e2e913b04 am:
b07ddf3814 am:
596e3a9d1a
am:
821fdbd3ff
Change-Id: I3dab3f81346bd13b1ae343dd6e21a437b642a080
Charles He [Thu, 29 Dec 2016 11:19:07 +0000 (11:19 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089 am:
ced5ab190c am:
3cc7f6acdc am:
e426dac4e2 am:
b75b025578
am:
3ad5df5231
Change-Id: I9c159162e18af0820c76d42c22e2ec001ab72c62
Charles He [Thu, 29 Dec 2016 11:18:04 +0000 (11:18 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15 am:
03fa83e216 am:
c189f23dd4 am:
835c1bcedb
am:
b5f3383589
Change-Id: I85ff02b53d1285d8e8a4e7c30ae9a988c52d6468
Charles He [Thu, 29 Dec 2016 11:16:55 +0000 (11:16 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad am:
9bc2d6b446
am:
08ea823955
Change-Id: I079501cac553468878a6642a64110f4de3e56698
Charles He [Thu, 29 Dec 2016 11:06:56 +0000 (11:06 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b am:
5c74a1e9bb am:
1d84f619bf am:
0e2e913b04 am:
b07ddf3814
am:
596e3a9d1a
Change-Id: If8e61075126f4b8a5ccf5a29e2bd74fec222f2f6
Charles He [Thu, 29 Dec 2016 11:05:43 +0000 (11:05 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089 am:
ced5ab190c am:
3cc7f6acdc am:
e426dac4e2
am:
b75b025578
Change-Id: Iff7b172dafedff0dcca720c4e7ca1c16e8c6a35c
Charles He [Thu, 29 Dec 2016 11:04:37 +0000 (11:04 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15 am:
03fa83e216 am:
c189f23dd4
am:
835c1bcedb
Change-Id: Ia49ac04fb87b215fc52b0dd40d917f2aab045745
Charles He [Thu, 29 Dec 2016 11:03:26 +0000 (11:03 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f am:
dd7837c5ad
am:
9bc2d6b446
Change-Id: I7e5794885bf78dfd1d755a7fdb0b1edf66b9fdee
Charles He [Thu, 29 Dec 2016 10:58:44 +0000 (10:58 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b am:
5c74a1e9bb am:
1d84f619bf am:
0e2e913b04
am:
b07ddf3814
Change-Id: I5fc69e1d8e02e405ae9ca8362a5c1f6312b4f53e
Charles He [Thu, 29 Dec 2016 10:57:41 +0000 (10:57 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089 am:
ced5ab190c am:
3cc7f6acdc
am:
e426dac4e2
Change-Id: I6451344efe089a7ff5de2082a9b8b77661c49ab7
Charles He [Thu, 29 Dec 2016 10:56:32 +0000 (10:56 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15 am:
03fa83e216
am:
c189f23dd4
Change-Id: I8426e0788ce1dcb12daac23e82663284633cae5b
Charles He [Thu, 29 Dec 2016 10:55:23 +0000 (10:55 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f
am:
dd7837c5ad
Change-Id: I2124f52b38314199950d1448cddd2bbd328c85ce
Charles He [Thu, 29 Dec 2016 10:44:41 +0000 (10:44 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b am:
5c74a1e9bb am:
1d84f619bf
am:
0e2e913b04
Change-Id: I02047ef2536a6a77df84e1b203d3b5ee55439e32
Charles He [Thu, 29 Dec 2016 10:43:40 +0000 (10:43 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089 am:
ced5ab190c
am:
3cc7f6acdc
Change-Id: I98e65fcf8180e5187a92e8d5b888eb794f89ab6d
Charles He [Thu, 29 Dec 2016 10:42:32 +0000 (10:42 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15
am:
03fa83e216
Change-Id: I8f10fcf6b604848f68ecc086dd3723841e07ef8c
Charles He [Thu, 29 Dec 2016 10:41:25 +0000 (10:41 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0
am:
8bcdab7e6f
Change-Id: I6e41bfad4ce66ca80bca636a5fb4ddc85b71e83a
Charles He [Thu, 29 Dec 2016 10:37:45 +0000 (10:37 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b am:
5c74a1e9bb
am:
1d84f619bf
Change-Id: Ic189edc98c3079ca98b258d08a5821b9c97dc027
Charles He [Thu, 29 Dec 2016 10:36:32 +0000 (10:36 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089
am:
ced5ab190c
Change-Id: I59602f83fd659ce5192636d0e66feae217997d7c
Charles He [Thu, 29 Dec 2016 10:35:19 +0000 (10:35 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5
am:
6bb6f02a15
Change-Id: I849811a3be2c6989edea3ed6f938b4b36a4fabe7
Charles He [Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9
am:
9a47fa7fc0
Change-Id: Ifb9f5b177f7c031352e6e9cf308e6295f7c60074
Charles He [Thu, 29 Dec 2016 10:28:57 +0000 (10:28 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b
am:
5c74a1e9bb
Change-Id: Ie15d3c1927f17a36ed6d6bbe4b96c986536be3c7
Charles He [Thu, 29 Dec 2016 10:27:52 +0000 (10:27 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8
am:
0cc0219089
Change-Id: Id72d64d9356e362f35062bc6e45071b2be308558
Charles He [Thu, 29 Dec 2016 10:26:51 +0000 (10:26 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd
am:
e15e0de7e5
Change-Id: I12af619f1fce710f643387dca3e06c1c4b5258d3
Charles He [Thu, 29 Dec 2016 10:25:50 +0000 (10:25 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882
am:
e5156ec1e9
Change-Id: I62b79fe7ef5a2febce27729f4709a599832cb3da
Charles He [Thu, 29 Dec 2016 10:21:47 +0000 (10:21 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad
am:
f027831c6b
Change-Id: I49d10d41d5b89c97a2f418ccaed44eeae720bb22
Charles He [Thu, 29 Dec 2016 10:20:47 +0000 (10:20 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2
am:
76ca2da7e8
Change-Id: I9e20b2954ccb462cee31cb5ea44986c00afadbff
Charles He [Thu, 29 Dec 2016 10:19:49 +0000 (10:19 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7
am:
b64af9bacd
Change-Id: I261c46544e8e1aef26772d57475037810198e4d9
Charles He [Thu, 29 Dec 2016 10:18:49 +0000 (10:18 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611
am:
00a581f882
Change-Id: I016955744e48d7a91380c2ff39f7c64536a39c7e
Charles He [Thu, 29 Dec 2016 10:14:26 +0000 (10:14 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d
am:
a1d59972ad
Change-Id: I027ab6594b563204515677fca9c256251b7067cd
Charles He [Thu, 29 Dec 2016 10:13:27 +0000 (10:13 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f
am:
6aa436bef2
Change-Id: I994b2fe070091a32beffff9dbf11b907b7878fe8
Charles He [Thu, 29 Dec 2016 10:12:24 +0000 (10:12 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92
am:
d7f2a4b0c7
Change-Id: I3019f9751b69809d3cb66061753f0b76085b235b
Charles He [Thu, 29 Dec 2016 10:11:20 +0000 (10:11 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d
am:
133ff4d611
Change-Id: I54b163f645f561243aac3df1a55c1023531997b3
Charles He [Thu, 29 Dec 2016 10:07:20 +0000 (10:07 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b
am:
1422a6074d
Change-Id: I2f3bf02f57c5f00964e645321467977b4ef498a7
Charles He [Thu, 29 Dec 2016 10:06:14 +0000 (10:06 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9
am:
d0339c6e8f
Change-Id: I0dbec3edf704821eb4605a48b770461eb99ddae7
Charles He [Thu, 29 Dec 2016 10:05:02 +0000 (10:05 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888
am:
a8484b4f92
Change-Id: Id5a9576ab6e37e3744a59d904909d11f668d0e06
Charles He [Thu, 29 Dec 2016 10:03:53 +0000 (10:03 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca
am:
2ce5c4320d
Change-Id: I29339a634fd22cd46bfc08619464da8fe159a2b7
Charles He [Thu, 29 Dec 2016 09:50:26 +0000 (09:50 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev
am:
63a27d773b
Change-Id: I01d332678c1c3fe57ed36062a9ed01b5f368a55d
Charles He [Thu, 29 Dec 2016 09:50:20 +0000 (09:50 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable.
am:
71d2a41dd9
Change-Id: Iab575b1efdd720c9cf9e32e0b056c99eff98deab
Charles He [Thu, 29 Dec 2016 09:48:50 +0000 (09:48 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
am:
4bd97eb888
Change-Id: I607f7ca9e160c4eed69a5baeff6b31d6db7c6b03
Charles He [Thu, 29 Dec 2016 09:48:45 +0000 (09:48 +0000)]
Prevent writing to FRP partition during factory reset.
am:
a9437bd1ca
Change-Id: Ib0b8db2357317dc3e680910c08f15f098baf2af9
Charles He [Thu, 29 Dec 2016 09:43:10 +0000 (09:43 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev
Charles He [Thu, 29 Dec 2016 09:42:25 +0000 (09:42 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
TreeHugger Robot [Thu, 29 Dec 2016 01:41:52 +0000 (01:41 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev
Jiaquan He [Thu, 29 Dec 2016 00:13:14 +0000 (00:13 +0000)]
Merge "2D recents: show all close buttons right away" into nyc-mr2-dev
Jiaquan He [Thu, 29 Dec 2016 00:12:48 +0000 (00:12 +0000)]
Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev
Jiaquan He [Tue, 27 Dec 2016 23:38:44 +0000 (15:38 -0800)]
Cut the Grid-based Recents title if it's too long.
Bug:
33847657
Bug:
32101881
Change-Id: I040dafcb37c9259dded8fa2cd896e4e4a59aeae5
Jiaquan He [Tue, 27 Dec 2016 22:44:14 +0000 (14:44 -0800)]
Move grid checking into the layout algorithm.
We move grid layout checking into the layout algorithm, so that we can
hide more computation from the views.
Bug:
32101881
Change-Id: I174fe33ef7ed3c04987771dbb42d831a4b9bdab2
TreeHugger Robot [Wed, 28 Dec 2016 23:50:52 +0000 (23:50 +0000)]
Merge "Resue TaskView information." into nyc-mr2-dev
dooyoung.hwang [Thu, 22 Dec 2016 11:04:20 +0000 (20:04 +0900)]
QS - Fix race condition in accessibility
When users try to open panel, initialization of accessibility is called
in Main Thread by this callstack.
at android.view.ViewGroup.buildOrderedChildList
at android.view.View.populateAccessibilityNodeInfoDrawingOrderInParent
at android.view.View.onInitializeAccessibilityNodeInfoInternal
at android.view.View.onInitializeAccessibilityNodeInfo
at android.view.View.createAccessibilityNodeInfoInternal
at android.view.View.createAccessibilityNodeInfo
at android.view.accessibility.AccessibilityRecord.setSource
...
at android.view.View.setFlags
at android.view.View.setVisibility
at com.android.systemui.qs.QSContainer.updateQsState
at com.android.systemui.qs.QSContainer.setExpanded
at com.android.systemui.statusbar.phone.NotificationPanelView.updateQsState
And another initialization is tried in QSTileHost Thread by this callstack.
at android.view.ViewGroup.buildOrderedChildList
at android.view.View.populateAccessibilityNodeInfoDrawingOrderInParent
at android.view.View.onInitializeAccessibilityNodeInfoInternal
at android.view.ViewGroup.onInitializeAccessibilityNodeInfoInternal
at android.view.View.onInitializeAccessibilityNodeInfo
at android.view.View.createAccessibilityNodeInfoInternal
at android.view.View.createAccessibilityNodeInfo
at android.view.accessibility.AccessibilityRecord.setSource
...
at android.view.View.announceForAccessibility
at com.android.systemui.qs.QSPanel.onAnnouncementRequested
at com.android.systemui.qs.QSTile.handleStateChanged
This race condition can cause crashes, because the same ArrayList
(mPreSortedChildren or mTempArrayList in ViewGroup) is modified by two
different thread.
Test : manual
Change-Id: I9e0ad1fef4be7dc378463c06d10854e0e4c5b3d6
Fixes:
33947140
(cherry picked from commit
1b0066230edee70aa58bb866ba9b59a4a68690fc)
Andrew Solovay [Wed, 28 Dec 2016 20:32:03 +0000 (20:32 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc
am:
897df2b5af
Change-Id: I32b241e93caac5e38c54610b799c877365be75ff
Andrew Solovay [Wed, 28 Dec 2016 20:31:02 +0000 (20:31 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33
am:
2891357f4d
Change-Id: I9b15c8787d6f6aa6c2d362de46ab06a583d3283c
Andrew Solovay [Wed, 28 Dec 2016 20:24:34 +0000 (20:24 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
am:
61dad4b2fc
Change-Id: I1918b70ad644f7aded33d27bcc55e05478d9f773
Andrew Solovay [Wed, 28 Dec 2016 20:24:30 +0000 (20:24 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
am:
40ba793b33
Change-Id: I5d15df8192fee8362dca8dcc53d84b75af29a13f
Andrew Solovay [Wed, 28 Dec 2016 20:16:26 +0000 (20:16 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
Jiaquan He [Wed, 28 Dec 2016 19:12:23 +0000 (19:12 +0000)]
Merge "Check split screen properly." into nyc-mr2-dev
OSDN Git Service
