OSDN Git Service
Steve McKay [Wed, 24 Aug 2016 19:55:25 +0000 (19:55 +0000)]
Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev
am:
850912db88
Change-Id: Iaa44a8af85622bfa508df06eef46645966735457
Steve McKay [Wed, 24 Aug 2016 19:55:22 +0000 (19:55 +0000)]
DO NOT MERGE: Don't create DocumentInfo instances in background.
am:
b818058f4e
Change-Id: Ib43fd7c9cba300821a908f7036415b8b1635bb4a
TreeHugger Robot [Wed, 24 Aug 2016 19:49:34 +0000 (19:49 +0000)]
Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev
Salvador Martinez [Wed, 24 Aug 2016 18:40:05 +0000 (18:40 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev am:
ed004e2958 am:
e9c519e049
am:
e8e7f1b88a
Change-Id: If2f11f73da080be1483eb49d36f83ee6034ecf45
Salvador Martinez [Wed, 24 Aug 2016 18:40:02 +0000 (18:40 +0000)]
Added error handling to settings suggestions list am:
18bf581c77 am:
2cb851e5c9
am:
cfa4ad4e1e
Change-Id: Iad0b0a73b544ca2eb7a2ea38cefd16fddd960443
Alan Viverette [Wed, 24 Aug 2016 18:34:28 +0000 (18:34 +0000)]
Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev
am:
709f0f3e15
Change-Id: I7b744d8eac043ca4e18bb43ad25bddb438711269
Alan Viverette [Wed, 24 Aug 2016 18:34:26 +0000 (18:34 +0000)]
Ensure the layer drawable callback is set when loading from theme
am:
11a84b8429
Change-Id: Ia6994252d09b6cc008847cd0e084949ada7b2ab2
Alan Viverette [Wed, 24 Aug 2016 18:33:58 +0000 (18:33 +0000)]
Merge "Improve docs for GradientDrawable's useLevel and centerX/Y properties" into nyc-mr1-dev
am:
20109a689d
Change-Id: Ie3031e5218f0ed02b1fc7726fc6ac0aa39db8c56
Alan Viverette [Wed, 24 Aug 2016 18:32:55 +0000 (18:32 +0000)]
Improve docs for GradientDrawable's useLevel and centerX/Y properties
am:
daec5506c4
Change-Id: If6c4b531a17abbed1a06478ec263bc89242638b3
Salvador Martinez [Wed, 24 Aug 2016 18:32:11 +0000 (18:32 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev am:
ed004e2958
am:
e9c519e049
Change-Id: Ie99c9e7d6747866efb03484dbbeec89d4dc6d74b
Salvador Martinez [Wed, 24 Aug 2016 18:32:09 +0000 (18:32 +0000)]
Added error handling to settings suggestions list am:
18bf581c77
am:
2cb851e5c9
Change-Id: I5f28a0c854597a576791be97fd1ab0c87183d65d
Alan Viverette [Wed, 24 Aug 2016 18:32:07 +0000 (18:32 +0000)]
Merge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev
am:
16b8941dba
Change-Id: I37e7ad00f3bbffaf686d22ad1a3dd452d8a20b49
Alan Viverette [Wed, 24 Aug 2016 18:31:38 +0000 (18:31 +0000)]
Clean up VideoView, SurfaceView constructors
am:
768ca7d19b
Change-Id: Ia3ff40a2c6dbbb2a725bc6306401de3cd662ba33
Alan Viverette [Wed, 24 Aug 2016 18:31:11 +0000 (18:31 +0000)]
Merge "Constrain input hour and minute to valid range" into nyc-mr1-dev
am:
4e32b47c48
Change-Id: I438a71a44830afb128e107847ec5bca4499073c8
Alan Viverette [Wed, 24 Aug 2016 18:30:20 +0000 (18:30 +0000)]
Constrain input hour and minute to valid range
am:
f0ac2ba9f4
Change-Id: I5f365e4869f0aabec71e478d9cba4edc3ce30900
Alan Viverette [Wed, 24 Aug 2016 18:29:18 +0000 (18:29 +0000)]
Merge "Override LinearLayout's onLayout pass in AlertDialogLayout" into nyc-mr1-dev
am:
52306705c1
Change-Id: Ia0b9ea70f0c086149cc145bb50dc5dadaa167e40
Alan Viverette [Wed, 24 Aug 2016 18:28:40 +0000 (18:28 +0000)]
Override LinearLayout's onLayout pass in AlertDialogLayout
am:
1bb8f51e76
Change-Id: I63af639e859e2b7c72d93233c5b9ec7da2bb01cf
Salvador Martinez [Wed, 24 Aug 2016 18:28:00 +0000 (18:28 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
am:
ed004e2958
Change-Id: I674216ef4471444c86b202896b8ce055c54eb584
Salvador Martinez [Wed, 24 Aug 2016 18:27:56 +0000 (18:27 +0000)]
Added error handling to settings suggestions list
am:
18bf581c77
Change-Id: Id946b2b75b9adc4c70fa4537da4ac509a6ab5c66
Salvador Martinez [Wed, 24 Aug 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
Alan Viverette [Wed, 24 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev
Alan Viverette [Wed, 24 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Improve docs for GradientDrawable's useLevel and centerX/Y properties" into nyc-mr1-dev
Alan Viverette [Wed, 24 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev
Alan Viverette [Wed, 24 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Constrain input hour and minute to valid range" into nyc-mr1-dev
Alan Viverette [Wed, 24 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Override LinearLayout's onLayout pass in AlertDialogLayout" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 24 Aug 2016 18:13:59 +0000 (18:13 +0000)]
Merge changes from topic 'am-
25ded4410ce544918d9fbc387ab4e1e3' into cw-f-dev
* changes:
Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev am:
d90b69ffb1
redact PII only for non-null value and apply SHA-1 am:
d0a7649f53
Andrew Rossignol [Wed, 24 Aug 2016 18:13:01 +0000 (18:13 +0000)]
Merge "Remove the incognito start page resource." into cw-f-dev
Chen Xu [Wed, 24 Aug 2016 18:12:48 +0000 (18:12 +0000)]
Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev
am:
d90b69ffb1
Change-Id: Iab3db28183e0756f65c8ccea29196002fe608904
fionaxu [Wed, 24 Aug 2016 18:12:43 +0000 (18:12 +0000)]
redact PII only for non-null value and apply SHA-1
am:
d0a7649f53
Change-Id: I4424a97dc00444df80c53fe4bbb20dfb7840e441
Chen Xu [Wed, 24 Aug 2016 18:08:19 +0000 (18:08 +0000)]
Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev
Doris Ling [Wed, 24 Aug 2016 18:04:42 +0000 (18:04 +0000)]
Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev
am:
d5f9642488
Change-Id: Ib3f80a096d333e7bd3dbdfb57a91be41d4aa823b
Doris Ling [Wed, 24 Aug 2016 18:04:39 +0000 (18:04 +0000)]
Add metrics logging for Settings -> Help & Feedback
am:
319c806cc0
Change-Id: I32966869e910b4c6e36fe3245af2edfa7a6f6a87
Doris Ling [Wed, 24 Aug 2016 18:01:26 +0000 (18:01 +0000)]
Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev
Alan Viverette [Wed, 24 Aug 2016 17:49:58 +0000 (17:49 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am:
462f29f77f am:
f9489216eb
am:
6c1e7451b3
Change-Id: If5ce87ac37637948aae79af46ca54b4d4be13985
Alan Viverette [Wed, 24 Aug 2016 17:49:55 +0000 (17:49 +0000)]
Avoid potential re-entry as a result of child mutation am:
66b3a0d1aa am:
70ccc698ec
am:
992ef58a33
Change-Id: Ie07b98d2006707d177beb2c43d31f3d28917dc91
Alan Viverette [Wed, 24 Aug 2016 17:43:45 +0000 (17:43 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am:
462f29f77f
am:
f9489216eb
Change-Id: If2389e3de3f5b511ed0ac7cee1025ec2d31cbabc
Alan Viverette [Wed, 24 Aug 2016 17:43:43 +0000 (17:43 +0000)]
Avoid potential re-entry as a result of child mutation am:
66b3a0d1aa
am:
70ccc698ec
Change-Id: Ia85253ba6ce6bece037717b7d87955dcac4e9f81
Alan Viverette [Wed, 24 Aug 2016 17:37:53 +0000 (17:37 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
am:
462f29f77f
Change-Id: Iefb3d33a407aa719c988217b136187378617da8f
Alan Viverette [Wed, 24 Aug 2016 17:37:50 +0000 (17:37 +0000)]
Avoid potential re-entry as a result of child mutation
am:
66b3a0d1aa
Change-Id: I1fa6619145a6aaceb4c743d378fbc5b198da6cdd
TreeHugger Robot [Wed, 24 Aug 2016 17:27:07 +0000 (17:27 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
Tony Mantler [Wed, 24 Aug 2016 17:05:17 +0000 (17:05 +0000)]
Merge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev
am:
97231323b7
Change-Id: Iae6db760981058999637d93017b1cb11c6ebb802
Tony Mantler [Wed, 24 Aug 2016 17:05:13 +0000 (17:05 +0000)]
Fix AsyncTask to handle exceptions in doInBackground
am:
78a8e9d293
Change-Id: Ie56e95882f0aa1224a4eb03ac25374bb08454d2c
Tony Mantler [Wed, 24 Aug 2016 17:00:02 +0000 (17:00 +0000)]
Merge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev
Salvador Martinez [Thu, 4 Aug 2016 20:37:52 +0000 (13:37 -0700)]
Added error handling to settings suggestions list
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.
Bug:
30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
(cherry picked from commit
60d92b3b8390e33e069f343d6a425ab07c498d3d)
Alan Viverette [Wed, 24 Aug 2016 16:35:47 +0000 (12:35 -0400)]
Ensure the layer drawable callback is set when loading from theme
Previously we would skip setting the changing configurations and callback
if the drawable had been loaded post-inflation from a theme attribute.
Bug:
30756548
Change-Id: Ia5457723ae8a62506a7562299d3fe78ec21f8030
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
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
Alan Viverette [Wed, 24 Aug 2016 16:26:27 +0000 (12:26 -0400)]
Override LinearLayout's onLayout pass in AlertDialogLayout
LinearLayout sets up internal state during onLayout that's missing when
we override onMeasure. Avoid calling super.onMeasure() by re-implementing
onLayout without the internal state dependencies.
Bug:
30494039
Change-Id: I1149517a2fe5f5afdb4125db5e7f573588fea740
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
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
Rubin Xu [Wed, 24 Aug 2016 14:28:55 +0000 (14:28 +0000)]
Set DeviceLockedForUser state synchronously
am:
9201a30a95
Change-Id: Ia046cbf84df5db428d54df56d744ae8d6da5521a
Rubin Xu [Wed, 24 Aug 2016 14:23:42 +0000 (14:23 +0000)]
Merge "Set DeviceLockedForUser state synchronously" 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
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
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
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
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
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
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
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
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
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
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
Steve McKay [Tue, 23 Aug 2016 22:35:53 +0000 (15:35 -0700)]
DO NOT MERGE: Don't create DocumentInfo instances in background.
Cursor access is not threadsafe resulting in operations on incorrect files.
Bug:
30082168
Change-Id: Ib36d5b7acdee9463b6ebd2553172e5ecb4d70857
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
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
Jorim Jaggi [Wed, 24 Aug 2016 01:26:40 +0000 (01:26 +0000)]
Remove swipe-up gesture from Tuner
am:
3793aff806
Change-Id: I601fdce7b6e88e30b2ccfdf55d84ed41ff1d5e36
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
TreeHugger Robot [Wed, 24 Aug 2016 01:21:05 +0000 (01:21 +0000)]
Merge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev
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
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
Todd Kennedy [Wed, 24 Aug 2016 00:14:37 +0000 (00:14 +0000)]
use directory timestamp during OTA
am:
095d4125be
Change-Id: I9c429b193f808181d2cec02c0caeda07058a35db
TreeHugger Robot [Wed, 24 Aug 2016 00:09:18 +0000 (00:09 +0000)]
Merge "use directory timestamp during OTA" 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
Justin Klaassen [Wed, 24 Aug 2016 00:09:00 +0000 (00:09 +0000)]
Improve logging for NightDisplayService/TwilightService
am:
ec8837ae26
Change-Id: Id92024b32a49713bc45159dc9347397c359d9711
TreeHugger Robot [Wed, 24 Aug 2016 00:04:40 +0000 (00:04 +0000)]
Merge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev
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
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
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
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
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
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
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
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
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
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
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
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"
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
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
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)
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
Doris Ling [Mon, 8 Aug 2016 23:17:43 +0000 (16:17 -0700)]
Add metrics logging for Settings -> Help & Feedback
Add new metrics event constant for Settings->Help & Feedback, and log it
whenever user selects the help option menu, passing the context extra for
the corresponding settings preference where the help menu is launched.
Change-Id: I971e8e50b959a5451ed085e5da5fd8504111e6c3
Fixes:
30140281
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
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
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
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
Andrew Rossignol [Tue, 23 Aug 2016 20:55:55 +0000 (13:55 -0700)]
Remove the incognito start page resource.
Bug:
28215770
Change-Id: Ibf0c67b6e995434bf4a5178e294e950f7f486125
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
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
OSDN Git Service
