OSDN Git Service
Siyamed Sinir [Mon, 11 Sep 2017 23:06:27 +0000 (23:06 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
am:
846a46043c
Change-Id: I00fa802fca31e973609932fcadf49b8889f1bf00
Siyamed Sinir [Mon, 11 Sep 2017 22:52:01 +0000 (22:52 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
Tony Mak [Mon, 11 Sep 2017 14:52:59 +0000 (14:52 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2 am:
79a32d0a8a -s ours
am:
9c358ccbe2 -s ours
Change-Id: I18c8460309c8330504d50eb16ce3cb39b36d2ee1
Tony Mak [Mon, 11 Sep 2017 14:43:33 +0000 (14:43 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2
am:
79a32d0a8a -s ours
Change-Id: I4b97babe4f5259c71bb301d08318e09eb4560e37
Tony Mak [Mon, 11 Sep 2017 14:36:08 +0000 (14:36 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3
am:
4453c3cda2
Change-Id: Ic48643564a3685bc602c66901c9761b741b148a5
Tony Mak [Mon, 11 Sep 2017 14:28:44 +0000 (14:28 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357
am:
68cce397b3
Change-Id: Ieb10d27e72646260f0c75535485a6fe11efe2a32
Tony Mak [Mon, 11 Sep 2017 14:17:10 +0000 (14:17 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227
am:
34377e0357
Change-Id: Ief87ce5e1dc9e5b424d70e72144084aa778ca0d6
Tony Mak [Mon, 11 Sep 2017 14:04:00 +0000 (14:04 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev
am:
d7dcc3e227
Change-Id: Ie10cba479c7d83ed001b863c648976a26ae30756
Tony Mak [Mon, 11 Sep 2017 10:38:07 +0000 (11:38 +0100)]
resolve merge conflicts of
56a2b529373b to nyc-dev
Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Merged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512
Change-Id: I81183e5b5bc702fb245a6a51afe6709c5b9dd3de
Tony Mak [Mon, 11 Sep 2017 08:44:22 +0000 (08:44 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c am:
a1cbcf5513
am:
220e7c1628
Change-Id: Ib882539bf0f362d3dbd279418d37b8fd56a9d8f1
Tony Mak [Mon, 11 Sep 2017 08:36:08 +0000 (08:36 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c
am:
a1cbcf5513
Change-Id: I37cafa9ee6e166e27c074e6317a6a818fe9e87a5
Tony Mak [Mon, 11 Sep 2017 08:26:32 +0000 (08:26 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
am:
328c129f4c
Change-Id: If2d6418cf2a71b2ae3094349101e71903c016224
TreeHugger Robot [Mon, 11 Sep 2017 08:14:19 +0000 (08:14 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
Suprabh Shukla [Mon, 11 Sep 2017 05:35:27 +0000 (05:35 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours am:
3beb50ba24 -s ours
am:
d5c753a6e5 -s ours
Change-Id: I337f3213d40930c9b844a7eb246b184d9681703f
Suprabh Shukla [Mon, 11 Sep 2017 05:21:07 +0000 (05:21 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours am:
67f43835ad -s ours
am:
3beb50ba24 -s ours
Change-Id: Ife3545f0c707b9616e5d0c6026e93bc0132a09c6
Suprabh Shukla [Mon, 11 Sep 2017 05:09:32 +0000 (05:09 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours am:
6a48feaab8 -s ours
am:
67f43835ad -s ours
Change-Id: I71f6d14cd5df5c556f4794ca581146c38d3af9c8
Suprabh Shukla [Mon, 11 Sep 2017 04:55:50 +0000 (04:55 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours am:
467ed9d15a -s ours
am:
6a48feaab8 -s ours
Change-Id: Ie05f69480ee2aec055dad3622072f3fc5e569e8a
Suprabh Shukla [Mon, 11 Sep 2017 04:41:52 +0000 (04:41 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours am:
3f824a362f -s ours
am:
467ed9d15a -s ours
Change-Id: I81bac89584c667c35b7fff8ff3446c57c73cf617
Suprabh Shukla [Mon, 11 Sep 2017 04:29:03 +0000 (04:29 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0 am:
4b8fb78007 -s ours
am:
3f824a362f -s ours
Change-Id: Ice5595805d71402bbfbdda2efe44e180f346d54b
Suprabh Shukla [Mon, 11 Sep 2017 04:10:16 +0000 (04:10 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361 am:
54f494ffc0
am:
4b8fb78007 -s ours
Change-Id: Idaff77e48bf3901ef0cbff54d3ceb19223a48338
Tony Mak [Mon, 11 Sep 2017 03:41:57 +0000 (03:41 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev
am:
5e4b2b15ec
Change-Id: I54c0be2c389aacb367b3c8c7e749475dced25f3c
TreeHugger Robot [Mon, 11 Sep 2017 03:22:05 +0000 (03:22 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev
Suprabh Shukla [Sun, 10 Sep 2017 20:47:27 +0000 (20:47 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b am:
bf1b7e9030 -s ours
am:
84aa3f4c81 -s ours
Change-Id: I701fa204e66a8dd239e3ed3913f734e8ea503049
Suprabh Shukla [Sun, 10 Sep 2017 20:29:17 +0000 (20:29 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b am:
4f31a88d4b
am:
bf1b7e9030 -s ours
Change-Id: Ifcb9a5a08af1722bc5df28c470d4ca356b865acb
Suprabh Shukla [Sun, 10 Sep 2017 20:16:00 +0000 (20:16 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124 am:
25ec24740b
am:
4f31a88d4b
Change-Id: Ia97ee26a24e49809ad7484f850d256bc733ee239
Suprabh Shukla [Sun, 10 Sep 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229 am:
7d9e844124
am:
25ec24740b
Change-Id: I858f75717157bd9269bcd43d4198935302132d5a
Suprabh Shukla [Sun, 10 Sep 2017 20:00:05 +0000 (20:00 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361
am:
54f494ffc0
Change-Id: Ibbdf82686d13d9a554ef62774f140c57115118a3
Suprabh Shukla [Sun, 10 Sep 2017 19:48:10 +0000 (19:48 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am:
fc9e382229
am:
7d9e844124
Change-Id: Ifc197fbb16e1bb6773b2f08c7c62ca92f82238f7
Suprabh Shukla [Sun, 10 Sep 2017 19:47:46 +0000 (19:47 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73
am:
bf1b308361
Change-Id: Ia01d70256824947bed5e88e103bc263749404fbb
Suprabh Shukla [Sun, 10 Sep 2017 19:32:22 +0000 (19:32 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
am:
fc9e382229
Change-Id: I80e814ed0266b3868bd7039508bbc50b2e2a51aa
Suprabh Shukla [Sun, 10 Sep 2017 19:32:12 +0000 (19:32 +0000)]
Clearing up invalid entries when SyncStorageEngine starts
am:
5470469d73
Change-Id: I8ffaaf35be0e2586a5bdbbe5de6e6bd440e26017
TreeHugger Robot [Sun, 10 Sep 2017 19:25:54 +0000 (19:25 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
Felipe Leme [Fri, 8 Sep 2017 21:41:36 +0000 (21:41 +0000)]
Merge "Javadoc: Added alternative to Package verification." into oc-dev
am:
092349600d
Change-Id: Ic765df95fc660fb0df8a0f027d739ea999a36702
TreeHugger Robot [Fri, 8 Sep 2017 21:28:02 +0000 (21:28 +0000)]
Merge "Javadoc: Added alternative to Package verification." into oc-dev
Siyamed Sinir [Wed, 6 Sep 2017 22:15:44 +0000 (15:15 -0700)]
Prevent getting data from Clipboard if device is locked
Clipboard should not return data if the device is locked. This CL checks
for device locked state before returning values from get/has functions.
Test: bit -t CtsContentTestCases:android.content.cts.ClipboardManagerTest
Bug:
64934810
Change-Id: Icefac226615fe22a7735dff4ba4c3b528fb2ac12
Sujith Ramakrishnan [Thu, 7 Sep 2017 01:59:58 +0000 (01:59 +0000)]
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev
am:
c07c23b1f7 -s ours
Change-Id: I87c316c7b1738e9a85b867088a074536bc5e9db1
Sujith Ramakrishnan [Thu, 7 Sep 2017 00:09:21 +0000 (00:09 +0000)]
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev
TreeHugger Robot [Wed, 6 Sep 2017 19:00:00 +0000 (19:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 6 Sep 2017 13:57:50 +0000 (06:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I1f5a8fdd408de1a74689fe6e1de0422529d797d8
Bill Yi [Wed, 6 Sep 2017 05:31:46 +0000 (22:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I409427c1b5e9b8b3e29947002e8bc6d5985bec77
Suprabh Shukla [Fri, 12 May 2017 22:26:54 +0000 (15:26 -0700)]
Clearing up invalid entries when SyncStorageEngine starts
Any app with permission WRITE_SYNC_SETTINGS could write sync settings
for authorities or accounts that are not valid. This results in invalid
data being persisted to disk which can effectively lead to a DOS style
attack. Clearing such entries on boot will make sure that a reboot fixes
any such issues.
Test: cts-tradefed run cts-dev -m CtsSyncContentHostTestCases
Bug:
35028827
Change-Id: I9e206a42508e3cba65d7523bf47fff743f47dcb2
Merged-In: I9e206a42508e3cba65d7523bf47fff743f47dcb2
(cherry picked from commit
042a478b73c3b7f7cd73f5bb1af657cfe07d0571)
Julius D'souza [Tue, 5 Sep 2017 20:54:13 +0000 (20:54 +0000)]
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate. am:
1f3da1c8b9 -s ours am:
c7088d8bf8 -s ours
am:
ef6e002b30
Change-Id: Ie9aabc371ae2bad03bfced07acce9502d6c897ee
Julius D'souza [Tue, 5 Sep 2017 20:43:31 +0000 (20:43 +0000)]
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate. am:
1f3da1c8b9 -s ours
am:
c7088d8bf8 -s ours
Change-Id: I6cbd05dcb09b013e17f5c26c1fa24a656c7b8316
Pankaj Kanwar [Tue, 5 Sep 2017 20:25:36 +0000 (20:25 +0000)]
Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev
Julius D'souza [Tue, 5 Sep 2017 20:23:44 +0000 (20:23 +0000)]
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate.
am:
1f3da1c8b9 -s ours
Change-Id: Ib94052397392808af53de5c6f265a0cd29950b4e
Felipe Leme [Thu, 31 Aug 2017 19:37:33 +0000 (12:37 -0700)]
Javadoc: Added alternative to Package verification.
Bug:
64125551
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Change-Id: I371cd1752ab92e19461fe3bf3d034c7bc83ca2dd
Julius D'souza [Tue, 5 Sep 2017 17:17:06 +0000 (10:17 -0700)]
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate.
Some devices have catastrophic firmware issues in switching the sensor rate;
for these devices, the sensor rate switch should be skipped entirely.
Change-Id: I04fc3d27c99f95b33f86f012a8d398f817f7713a
Michael Plass [Fri, 1 Sep 2017 18:50:10 +0000 (18:50 +0000)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result am:
02d802e71e -s ours am:
b5ee561702 -s ours
am:
7391bedf87 -s ours
Change-Id: Ia4ed82872d97187158a8f958b44e68814b2c5356
Michael Plass [Fri, 1 Sep 2017 18:35:54 +0000 (18:35 +0000)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result am:
02d802e71e -s ours
am:
b5ee561702 -s ours
Change-Id: I64e924948b9cd7934d41e2261af73e2232bbaf80
Michael Plass [Fri, 1 Sep 2017 18:11:19 +0000 (18:11 +0000)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result
am:
02d802e71e -s ours
Change-Id: If1a7766ec46207280183c7eb08e036e526a12a34
Michael Plass [Thu, 13 Jul 2017 17:09:07 +0000 (10:09 -0700)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result
Bug:
62866191
Bug:
63074860
Bug:
65267749
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit
56e46134d364f7f293158979765336721a6c752c)
(cherry picked from commit
9c1d56576e01060f40de74a4c0e35e95064351be)
Amit Mahajan [Thu, 31 Aug 2017 20:49:28 +0000 (13:49 -0700)]
Remove config_tether_apndata for Telstra.
Test: manual
Bug:
63564491
Change-Id: Iaca29bfd474b7df6489b1daeaeea182ebf8d81ae
Zheng Zhang [Thu, 31 Aug 2017 17:37:44 +0000 (17:37 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014 am:
80a0f290f6
am:
e274cd7ae9
Change-Id: Ibc2a01cbfbc33c1ee07486b5556a91b9ebeaa532
Zheng Zhang [Thu, 31 Aug 2017 17:36:50 +0000 (17:36 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours
am:
6f94a3740a -s ours
Change-Id: I12d33400af3e2f3c358839380ddee7fb8791e839
Kevin Chyn [Thu, 31 Aug 2017 02:02:43 +0000 (19:02 -0700)]
Update UnlockMethodCache when screen turns off
Fixes:
65212307
Test: 1) add a temporary log in update()
2) turn off screen, make sure update() is called, and
canSkipBouncer value is updated and correct
Change-Id: I576d2375d38e83f286ad1fc6aa25944326c3ef8f
Phil Weaver [Wed, 30 Aug 2017 22:54:59 +0000 (22:54 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev
Sujith Ramakrishnan [Wed, 19 Jul 2017 01:35:14 +0000 (18:35 -0700)]
Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)
- KEYCODE_ASSIST: Looks for default VIS in system partition
and launches it.
- Ensure foreground activity assist context extras are collected
and sent to VIS.
- KEYCODE_ALL_APPS: Sends Intent.ACTION_ALL_APPS. For TV,
this targets default launcher package in system partition.
Test: Manual: ASSIST: adb shell input keyevent 219
Test: Manual: ALL_APPS: adb shell input keyevent 284
Test: also tested with --longpress for these keys
Test: Manual: Checked with dummy app populating overridden
onProvideAssistData()
Test: Keypresses after overriding ALL_APPS and ASSIST
on Nexus Remote
Bug:
37950079
Bug:
38496261
Change-Id: I96d9de67d4a442a8c6cb7feec28fc9aeb0dcbc18
Phil Weaver [Tue, 29 Aug 2017 20:43:01 +0000 (13:43 -0700)]
resolve merge conflicts of
490d397d284f to oc-dr1-dev
Bug:
62196835
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I1a3e3c5b1696a5f5b95eac187acb5a03863b4a0b
Change-Id: Ib00a23ae9a329cfc102b1a116b5a585be36b56f6
TreeHugger Robot [Tue, 29 Aug 2017 20:53:24 +0000 (20:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Zheng Zhang [Tue, 29 Aug 2017 18:58:35 +0000 (18:58 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014
am:
80a0f290f6
Change-Id: I3aa52949efe603e94ca7c84c4db8212ebe195822
Zheng Zhang [Tue, 29 Aug 2017 18:57:52 +0000 (18:57 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours
am:
d877297ad4 -s ours
Change-Id: If2056d42363944e8f251fde45199e43fa6ca6509
Zheng Zhang [Tue, 29 Aug 2017 18:46:23 +0000 (18:46 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev
am:
1c0dba5014
Change-Id: I45f36e954ad432bbb5117b50ab2b7c56974afdbd
Zheng Zhang [Tue, 29 Aug 2017 18:46:20 +0000 (18:46 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
am:
03c0f16f37 -s ours
Change-Id: I1e3ec0a6a8e861c10a6c7f19cc080b546d1bbd65
TreeHugger Robot [Tue, 29 Aug 2017 18:35:04 +0000 (18:35 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev
* changes:
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
DO NOT MERGE ANYWHERE: GnssLocationProvider: listening to conn lost event
DO NOT MERGE ANYWHERE: Restoring Network Available Notification to AGnssRil
Phil Weaver [Tue, 29 Aug 2017 18:08:54 +0000 (18:08 +0000)]
Merge "Backport overlay security fix" into oc-dev
Phil Weaver [Sat, 19 Aug 2017 01:01:46 +0000 (18:01 -0700)]
Backport overlay security fix
Replacing app opps fix with the flag that is used
elsewhere.
Bug:
37442941
Test: Verified that toast and system overlay still goes
away on permission and a11y service capability screens.
Merged-In: I1a3e3c5b1696a5f5b95eac187acb5a03863b4a0b
Change-Id: If9bec515105369055415d54c7fcad7a65431f8e7
Zheng Zhang [Tue, 22 Aug 2017 17:27:14 +0000 (10:27 -0700)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
TRANSPORT_BLUETOOTH is a essential network type for wearable device.
For non-master branch, only listen to Bluetooth on wearable device.
Bug:
64881794
Test: Trigger Bluetooth on/off on watch, check if UpdateNetworkState()
got called.
Change-Id: I30e39943220597987320ea7843d7d36827fdd0c7
(cherry picked from commit
d6886710b5c9ed9d1567c4ee59773071bae7070c)
Bill Yi [Sun, 27 Aug 2017 18:43:06 +0000 (11:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ida2b6138972c18c15b86e7822d010c4a675ab762
Bill Yi [Sun, 27 Aug 2017 11:19:13 +0000 (04:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia33326f08f0440ae65f9820b071b32a762c83965
Felipe Leme [Fri, 25 Aug 2017 21:36:04 +0000 (21:36 +0000)]
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev
am:
7d29b6f2df
Change-Id: Ibfabc9d32aa0da80e636a27eebf1b50bdd9692b3
TreeHugger Robot [Fri, 25 Aug 2017 21:27:56 +0000 (21:27 +0000)]
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev
TreeHugger Robot [Fri, 25 Aug 2017 21:25:02 +0000 (21:25 +0000)]
Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev
Felipe Leme [Fri, 25 Aug 2017 19:36:56 +0000 (19:36 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev
am:
560221752e
Change-Id: Ib2924dae99bfe132a56a1583ecf4a88f833d3937
TreeHugger Robot [Fri, 25 Aug 2017 19:12:22 +0000 (19:12 +0000)]
Merge "Minor Autofill javadoc fixes." into oc-dev
TreeHugger Robot [Thu, 24 Aug 2017 16:01:06 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 24 Aug 2017 11:18:53 +0000 (04:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ied6de9cbe69d8c72f9ba8c0095451a175f02d4dd
Bill Yi [Thu, 24 Aug 2017 03:13:10 +0000 (20:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ifc65484d51405de737a5b269fe6b6036638d0df1
Tim Murray [Wed, 23 Aug 2017 19:48:14 +0000 (19:48 +0000)]
Merge "power: throttle interaction hints" into oc-dev
am:
78701217fd -s ours
Change-Id: I5135ddb75679ff6e4ffe5bb8daff97daf05deb34
TreeHugger Robot [Wed, 23 Aug 2017 19:25:47 +0000 (19:25 +0000)]
Merge "power: throttle interaction hints" into oc-dev
Kevin Tang [Thu, 11 May 2017 02:36:20 +0000 (19:36 -0700)]
DO NOT MERGE ANYWHERE: GnssLocationProvider: listening to conn lost event
The HAL layer now gets onLost notificaiton as well
as connectivity available. This keeps HAL layer
better informed on what the on what the real
connection status is, for things like assistance
download.
Fixes:
34076506
Test: GPS works, even after delete all, and assistance
downloads wait politely when in airplane mode.
Change-Id: I4b5fb782f9370b0a45282c8a9dd5920120d449fb
Wyatt Riley [Wed, 7 Dec 2016 15:16:25 +0000 (07:16 -0800)]
DO NOT MERGE ANYWHERE: Restoring Network Available Notification to AGnssRil
Bug:
33350903
Change-Id: I8fe0ddbd011689258890ce37e37271cc6f170c6a
Fixes:
33350903
Test: On device GPS-still-works check (Ril check to be done by partners)
Adrian Roos [Mon, 21 Aug 2017 15:17:20 +0000 (17:17 +0200)]
AOD: Only play wakeup animation when actually waking up
Fixes an issue where the wake up animation could play when going to sleep,
if the screen turning on for AOD happened after the finishing going to sleep.
Change-Id: I6b00aaefb672a630f43ca229d6cc66d12bc4205c
Fixes:
64814671
Test: Pull up app launcher, turn off screen, verify AOD does not blink.
(cherry picked from commit
b9afae2e50c0240ee103ab44fad13b75aef985b6)
Baligh Uddin [Mon, 21 Aug 2017 21:40:53 +0000 (21:40 +0000)]
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev"
am:
230c78cec5 -s ours
Change-Id: Ida80fe80780bf4f811aa54e0163f5c936f4d16a6
The Android Automerger [Mon, 21 Aug 2017 21:28:42 +0000 (21:28 +0000)]
DO NOT MERGE ANYWHERE Manually merge commit '
fd35d7c0a284' into oc-dr1-dev
BUG:
64864568
Baligh Uddin [Sat, 19 Aug 2017 22:31:46 +0000 (15:31 -0700)]
DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev"
Bug:
64864568
This reverts commit
fd35d7c0a284e31231e2f424cade864be695965b, reversing
changes made to
07a21754f45672b27e765d8c7677c9663c6dce91.
Tyler Freeman [Sat, 19 Aug 2017 00:11:01 +0000 (00:11 +0000)]
Merge "Remove gender-specific pronouns from documentation" into oc-dev
Tyler Freeman [Wed, 9 Aug 2017 20:55:44 +0000 (13:55 -0700)]
Remove gender-specific pronouns from documentation
Bug:
64847340
Change-Id: Ifc48cebbab8ad1d7223d75637eb63049bc28ae7c
Tony Mak [Tue, 15 Aug 2017 18:56:39 +0000 (19:56 +0100)]
DPC should not be allowed to grant development permission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant_developmentPermission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant_developmentPermission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant
Test: Run "Permissions lockdown" test in CtsVerifier
Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Merged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512
Bug:
62623498
Change-Id: Ief96a23fa49f1ea923574840f8ff590a5ea2456e
Tony Mak [Thu, 10 Aug 2017 13:19:43 +0000 (14:19 +0100)]
DPC should not be allowed to grant development permission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant_developmentPermission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant_developmentPermission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant
Test: Run "Permissions lockdown" test in CtsVerifier
Bug:
62623498
Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Change-Id: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512
Seigo Nonaka [Fri, 18 Aug 2017 00:49:08 +0000 (00:49 +0000)]
Merge "Fix race condition of removing surface." into oc-dev
am:
07a21754f4 -s ours
Change-Id: Ic850275cc7f81629adcc5081ec9f137e531b9495
TreeHugger Robot [Fri, 18 Aug 2017 00:40:55 +0000 (00:40 +0000)]
Merge "Fix race condition of removing surface." into oc-dev
Felipe Leme [Thu, 10 Aug 2017 23:39:02 +0000 (16:39 -0700)]
Clarified that getAutofillValue() must return same value passed to autofill().
Test: m doc-comment-check-docs
Bug:
64114048
Change-Id: I618cc3703db64315a848cc483f460f1b27fec98b
TreeHugger Robot [Thu, 17 Aug 2017 23:03:35 +0000 (23:03 +0000)]
Merge "Let the foreground service channel be blocked" into oc-dr1-dev
Tony Mak [Thu, 17 Aug 2017 22:23:15 +0000 (22:23 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am:
0c2b2d1f87 -s ours
am:
c9a9fcdcd3 -s ours
Change-Id: I453d676952f885b1fc4afc21c0c11a17ae0bb90c
Tony Mak [Thu, 17 Aug 2017 22:07:36 +0000 (22:07 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev
am:
0c2b2d1f87 -s ours
Change-Id: Id0fe09b6f6ba687b6597ce2f97b6b8d83fbc4915
TreeHugger Robot [Thu, 17 Aug 2017 21:56:52 +0000 (21:56 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev
Julia Reynolds [Thu, 17 Aug 2017 17:34:27 +0000 (13:34 -0400)]
Let the foreground service channel be blocked
And update the channel name
Change-Id: Ic4b909d31b38b9e1ee05f9b3e4e5c91efc6752b1
Fixes:
36891897
Test: manual
Felipe Leme [Wed, 16 Aug 2017 16:21:46 +0000 (09:21 -0700)]
Minor Autofill javadoc fixes.
Bug:
64125551
Test: no, thanks
Change-Id: Idea93d3a55705fbed6ede7eac0c0791300ff1c90
Dianne Hackborn [Mon, 31 Jul 2017 20:56:02 +0000 (13:56 -0700)]
Maps crashed entering PIP right after...
...beginning navigation
Bug:
64140901
Test: booted and ran and posted notifications.
Merged-In:I8c9173dab2716b901cc6dd66f0b0d18cae33f298
Change-Id: I8c9173dab2716b901cc6dd66f0b0d18cae33f298
(cherry picked from commit
52195a66311d79a2f57e8112db86d48ed15bf915)
Vineeta Srivastava [Thu, 17 Aug 2017 03:07:47 +0000 (03:07 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev