OSDN Git Service
Julia Reynolds [Thu, 11 Apr 2019 03:06:30 +0000 (20:06 -0700)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev am:
2256fd4e11 am:
51fee974a9
am:
19ad060bf0
Change-Id: I0ed6effdd52e511fab32a668b8232fc0095e3295
Julia Reynolds [Thu, 11 Apr 2019 03:00:26 +0000 (20:00 -0700)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev am:
652a666500 am:
5d35ad7446
am:
03cddd8562
Change-Id: Ifa1fe4acb2249480c1b9067e1e53a3f020008859
Pavel Grafov [Thu, 11 Apr 2019 02:49:38 +0000 (19:49 -0700)]
[automerger skipped] [automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6 am:
20007cb46f am:
3ae9c5c63b -s ours
am:
8a317effc2 -s ours
am skip reason: change_id I2fef9ab13614627c0f1bcca04759d0974fc6181a with SHA1
1b6301cf24 is in history
Change-Id: I50b6c521adf14bad8d30232e9936b16859b4dc03
Julia Reynolds [Thu, 11 Apr 2019 00:44:09 +0000 (17:44 -0700)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev am:
2256fd4e11
am:
51fee974a9
Change-Id: I5c0f89e5614901b57880fff5b59a2f6766893903
Julia Reynolds [Thu, 11 Apr 2019 00:39:03 +0000 (17:39 -0700)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev am:
652a666500
am:
5d35ad7446
Change-Id: I0e8dff954426479e5a58f0a8f0dad10a294f7b25
Pavel Grafov [Thu, 11 Apr 2019 00:29:31 +0000 (17:29 -0700)]
[automerger skipped] [automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6 am:
20007cb46f
am:
3ae9c5c63b -s ours
am skip reason: change_id I2fef9ab13614627c0f1bcca04759d0974fc6181a with SHA1
1b6301cf24 is in history
Change-Id: I1065183419a6868c2f9d21ddae9b455056fbf963
Julia Reynolds [Thu, 11 Apr 2019 00:19:16 +0000 (17:19 -0700)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev
am:
2256fd4e11
Change-Id: I1658f2dc59428265adf385ec2e9c579abbefb023
Julia Reynolds [Wed, 10 Apr 2019 23:56:01 +0000 (16:56 -0700)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev
am:
652a666500
Change-Id: I4e93c29d4d65d14d39b683a27004f871b1dd0b9a
Pavel Grafov [Wed, 10 Apr 2019 23:41:27 +0000 (16:41 -0700)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6
am:
20007cb46f
Change-Id: I3bf88bf3a830dc7dea61e32d1df31b273a5d1afe
TreeHugger Robot [Wed, 10 Apr 2019 22:59:44 +0000 (22:59 +0000)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev
TreeHugger Robot [Wed, 10 Apr 2019 22:22:33 +0000 (22:22 +0000)]
Merge "Add cross user permission check - areNotificationsEnabledForPackage" into pi-dev
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8 skipped:
9f3fca716a
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
Pavel Grafov [Wed, 10 Apr 2019 18:47:42 +0000 (11:47 -0700)]
Limit IsSeparateProfileChallengeAllowed to system callers
am:
1b6301cf24
Change-Id: I1145186590622d415c6c10c4750cf9429806bdbe
Julia Reynolds [Wed, 27 Mar 2019 16:15:57 +0000 (12:15 -0400)]
Add cross user permission check - areNotificationsEnabledForPackage
Test: atest
Fixes:
128599467
Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
Merged-In: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
(cherry picked from commit
657d164136199126ae241848887de0230699cea0)
Julia Reynolds [Wed, 27 Mar 2019 16:15:57 +0000 (12:15 -0400)]
[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
Test: atest
Fixes:
128599467
Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
(cherry picked from commit
657d164136199126ae241848887de0230699cea0)
Android Build Merger (Role) [Wed, 10 Apr 2019 12:44:06 +0000 (12:44 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6
Change-Id: I9f9adc6f9979b3ee946e43150556f0ba971a67f8
Android Build Merger (Role) [Wed, 10 Apr 2019 12:44:01 +0000 (12:44 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88
Change-Id: I9f56349020376c4cb459597bf01cb4956344f7a8
Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:56 +0000 (12:43 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e
Change-Id: If32bb0948a2b9aa67b99ceae0ed9234f570198bf
Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:51 +0000 (12:43 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697
Change-Id: I064e17eb9e4a91cbf8cda5fe6ee37da48724634d
Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:44 +0000 (12:43 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b
Change-Id: Ia35b381b55199cc0c3b516ccc5091993a2c3d488
Pavel Grafov [Wed, 10 Apr 2019 11:47:25 +0000 (12:47 +0100)]
Limit IsSeparateProfileChallengeAllowed to system callers
Fixes:
128599668
Test: build, set up separate challenge
Merged-In: I2fef9ab13614627c0f1bcca04759d0974fc6181a
Change-Id: I2fef9ab13614627c0f1bcca04759d0974fc6181a
Pavel Grafov [Wed, 10 Apr 2019 11:47:25 +0000 (12:47 +0100)]
Limit IsSeparateProfileChallengeAllowed to system callers
Fixes:
128599668
Test: build, set up separate challenge
Change-Id: I2fef9ab13614627c0f1bcca04759d0974fc6181a
Android Build Merger (Role) [Tue, 9 Apr 2019 22:29:07 +0000 (22:29 +0000)]
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8 skipped:
9f3fca716a
Change-Id: I0dd61347ddd16574c9bb4f301725da09d88e737d
Android Build Merger (Role) [Tue, 9 Apr 2019 22:29:04 +0000 (22:29 +0000)]
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8
Change-Id: If90b329955ca2514e6c236932614648670d440ea
Bryan Ferris [Tue, 9 Apr 2019 22:29:03 +0000 (15:29 -0700)]
Merge changes from topic "am-
e391c592-eeb3-4cc9-85fd-
fa5d3bf694c5" into oc-dev am:
2833e406e0 am:
ed9361ce1c
am:
f5c11a0a27
Change-Id: Ia28625d8b0b2f596fe00efa02ecb0c0a57d36354
Android Build Merger (Role) [Tue, 9 Apr 2019 22:28:44 +0000 (22:28 +0000)]
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e
Change-Id: Ic6d7bf16ab67d441e77f003288129671c2ec327d
Android Build Merger (Role) [Tue, 9 Apr 2019 22:28:40 +0000 (22:28 +0000)]
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0
Change-Id: I362a9976890358467b16f07315295b17d767b9b1
Android Build Merger (Role) [Tue, 9 Apr 2019 22:28:33 +0000 (22:28 +0000)]
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
Change-Id: Ic1d3439eb787c393d0f595d04c7627345118474d
Julia Reynolds [Wed, 27 Mar 2019 16:15:57 +0000 (12:15 -0400)]
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
Test: atest
Fixes:
128599467
Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
(cherry picked from commit
657d164136199126ae241848887de0230699cea0)
Varun Shah [Tue, 9 Apr 2019 22:17:46 +0000 (15:17 -0700)]
Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
18e7dedf6c am:
5e3ef6a1ea
am:
4ff24d34d3
Change-Id: If9124acbd9d0c7e123d14a80b245121c27b56d37
Bryan Ferris [Tue, 9 Apr 2019 20:56:40 +0000 (13:56 -0700)]
Merge changes from topic "am-
e391c592-eeb3-4cc9-85fd-
fa5d3bf694c5" into oc-dev am:
2833e406e0
am:
ed9361ce1c
Change-Id: I8c538a46f02f4d46ddc5d78ee19612649c15a46c
Varun Shah [Tue, 9 Apr 2019 20:46:55 +0000 (13:46 -0700)]
Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
18e7dedf6c
am:
5e3ef6a1ea
Change-Id: I60be094774400df44d79a0291858a0783557831b
Bryan Ferris [Tue, 9 Apr 2019 20:20:18 +0000 (13:20 -0700)]
Merge changes from topic "am-
e391c592-eeb3-4cc9-85fd-
fa5d3bf694c5" into oc-dev
am:
2833e406e0
Change-Id: Iad49fea0efffc9766797f590b9140cb4bb73a3fd
Bryan Ferris [Tue, 9 Apr 2019 19:46:49 +0000 (19:46 +0000)]
Merge changes from topic "am-
e391c592-eeb3-4cc9-85fd-
fa5d3bf694c5" into oc-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b am:
49a505f4f9 skipped:
022bfaa808
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b am:
49a505f4f9
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965
[RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser.
Varun Shah [Tue, 9 Apr 2019 19:12:19 +0000 (12:12 -0700)]
Added missing permission check to isPackageDeviceAdminOnAnyUser.
am:
18e7dedf6c
Change-Id: I3cd02487a2f39775e86c22ed12fb0fae45198ba4
Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:47 +0000 (22:24 +0000)]
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b am:
49a505f4f9 skipped:
022bfaa808
Change-Id: I3bf41e099ceca0d122df82cf2f8a18d3ec8b3808
Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:42 +0000 (22:24 +0000)]
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b am:
49a505f4f9
Change-Id: I0af65577fac55fce95549a27dc3ecf00b94d20ff
Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:37 +0000 (22:24 +0000)]
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b
Change-Id: I172642a771dcafa2d106886984cba3de7a87ae03
Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:32 +0000 (22:24 +0000)]
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568
Change-Id: Ib3786714238c868448bc448408a854907052ae2d
Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:26 +0000 (22:24 +0000)]
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965
Change-Id: I6d0a4a82a74b78b156b877e0d0785de16cac3856
Bryan Ferris [Thu, 4 Apr 2019 22:18:52 +0000 (15:18 -0700)]
[RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser.
Added a check for the MANAGE_USERS permission to
PackageManagerService#isPackageDeviceAdminOnAnyUser.
Test: Modify the settings app to log the call attempt and follow the
steps below
In order to work around the limitations of N builds we needed to modify
the settings app to log the call attempt. This is described in detail at
b/
128599183#comment15
Bug:
128599183
Change-Id: Ie96c8e174983f61574f12d5d4b210d06377054e5
Varun Shah [Wed, 20 Mar 2019 18:10:33 +0000 (11:10 -0700)]
Added missing permission check to isPackageDeviceAdminOnAnyUser.
Added a check for the MANAGE_USERS permission to
PackageManagerService#isPackageDeviceAdminOnAnyUser.
To test that the method is still usable:
1) Enable virtual storage via: adb shell sm set-virtual-disk true
2) Follow instructions by clicking on notification to set up virtual storage
3) Go to Settings -> Apps & notifications -> See all X apps
4) Click on any non-system app (example Instagram)
5) Tap Storage and you should see a "Change" button (if not, choose another app)
6) Tap Change and you should see Internal and Virtual storage options listed
7) The above step confirms the method is still usable by Settings
Bug:
128599183
Test: SafetyNet logging (steps listed above)
Change-Id: I989f1daf52a71f6c778ebd81baa6f1bf83e9a718
Merged-In: I36521fa43daab399e08869647326a7ac32d1e512
Yin-Chia Yeh [Tue, 2 Apr 2019 19:07:19 +0000 (19:07 +0000)]
Merge "Camera: add QCIF resolution exception" into pi-dev
Yin-Chia Yeh [Wed, 23 Jan 2019 23:27:47 +0000 (15:27 -0800)]
Camera: add QCIF resolution exception
Also fix a typo.
Test: checkbuild
Bug:
120158047
Bug:
122461651
Change-Id: I61eab3f526e307b04a71c8382e9fa76aee7871e1
Rich Cannings [Thu, 28 Mar 2019 21:15:33 +0000 (21:15 +0000)]
Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev
Rich Cannings [Thu, 28 Mar 2019 21:15:33 +0000 (21:15 +0000)]
Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
TreeHugger Robot [Wed, 27 Mar 2019 05:09:25 +0000 (05:09 +0000)]
Merge "DO NOT MERGE Atoms: Add BluetoothClassicPairingEvent" into pi-dev
TreeHugger Robot [Tue, 26 Mar 2019 19:36:47 +0000 (19:36 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 25 Mar 2019 20:31:58 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idf2fed403af24397c26d6ee44a60a27ec9424274
Bill Yi [Sun, 24 Mar 2019 16:52:11 +0000 (09:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3fe34039e30e8fe80efc4c0cb9cfb1d373cee7b6
Jack He [Thu, 21 Mar 2019 00:38:11 +0000 (17:38 -0700)]
DO NOT MERGE Atoms: Add BluetoothClassicPairingEvent
* Add BluetoothClassicPairingEvent to log pairing and encryption
related statistics
Bug:
124301137
Test: test drive with statsd
Change-Id: Idca6f6d340e03af91c5a6fb4102666d44167635b
Rubin Xu [Fri, 15 Mar 2019 11:38:36 +0000 (11:38 +0000)]
DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache
In general the cache should store copies of the original data
to prevent the caller from accidentally corrupting the cache after
the data is cached. This wasn't an issue until recently when
LockSettingsService starts to aggressively zeroize buffers,
which caused some unit test failures.
Bug:
120484642
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/
Change-Id: I8cc61789f19613cca8ed36ca34aa42fe6b2ad674
(cherry picked from commit
4728d2114cae96127211637aea682ea89ceb7e24)
Rich Cannings [Thu, 21 Feb 2019 20:40:36 +0000 (12:40 -0800)]
DO NOT MERGE Refactor passwords/pins/patterns to byte[]
Relating to frameworks/base
Bug:
120484642
Test: manual - test setting and unlocking passwords/pins/patterns.
automated - atest services/tests/servicestests/src/com/android/server/locksettings/
Change-Id: I57aa530ca2db1a026c56b66f5b4c91172f2667f6
(cherry picked from commit
f64ec63a027447d8e38dd3e0d05d127cf06dccfc)
TreeHugger Robot [Tue, 19 Mar 2019 02:00:38 +0000 (02:00 +0000)]
Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev
TreeHugger Robot [Tue, 19 Mar 2019 02:00:38 +0000 (02:00 +0000)]
Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev
Varun Anand [Thu, 14 Mar 2019 18:28:00 +0000 (18:28 +0000)]
Revert "Revert "Update VPN capabilities when its underlying network set is null.""
This reverts commit
6a050c7c50fa0838d7e29b8c6e244018044246db.
Reason for revert: Retargeted for June monthly release
Bug:
119129310
Change-Id: I9d543415c5707859cfa2a14a1a8ce5909aae7d11
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
Todd Kennedy [Fri, 1 Mar 2019 21:56:47 +0000 (13:56 -0800)]
Change target SDK to '28'
Bug:
121306802
Test: none
Change-Id: I3e7302ab42987c177f9e538fd7fdf66c35f0bb79
Tiger Huang [Wed, 13 Mar 2019 00:21:27 +0000 (00:21 +0000)]
Merge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visible" into pi-dev
TreeHugger Robot [Mon, 11 Mar 2019 23:59:07 +0000 (23:59 +0000)]
Merge "onPageFinished javadoc cleanup" into pi-dev
Shimi Zhang [Sat, 23 Feb 2019 01:47:28 +0000 (17:47 -0800)]
onPageFinished javadoc cleanup
PictureListener was deprecated, we need to replace its mentioning in
onPageFinished() javadoc with postVisualStateCallback().
Bug:
125939241
Test: make ds-docs
Change-Id: I7c1641c86632bb6c8214fd701e052096952deeec
mavishsu [Tue, 5 Mar 2019 09:22:50 +0000 (17:22 +0800)]
DO NOT MERGE Add carrier config to use 3GPP application on CDMA/CDMA-LTE phone.
Bug:
124524824
Test: atest GsmCdmaPhoneTest
Change-Id: I002ece2bae63c1ce578a822f9961220ba1971557
TreeHugger Robot [Fri, 8 Mar 2019 00:55:04 +0000 (00:55 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Varun Anand [Thu, 7 Mar 2019 22:50:47 +0000 (22:50 +0000)]
Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev
Bill Yi [Thu, 7 Mar 2019 18:24:56 +0000 (10:24 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I32003be7ab473918497b871a6b34f229f01ae5b2
Varun Anand [Tue, 5 Mar 2019 19:23:50 +0000 (19:23 +0000)]
Revert "Update VPN capabilities when its underlying network set is null."
This reverts commit
ad8805a6c217338b12511f220cce22211a19080a.
Bug:
126245192
Reason for revert: This change can lead to a deadlock that was fixed in http://ag/
6580635. However, platform PMs think that fixing this is risky enough as this is not a recent problem and has been in the field for 3/4 of the year.
Note: The merged-in tag is used to avoid this change from getting merged into pi-dev-plus-aosp. This is to avoid merge conflicts since we mostly work in aosp/master which merges into pi-dev-plus-aosp.
Change-Id: I3814bcec87efb059f50f00617406501aaeac3b4d
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
Wyatt Riley [Mon, 4 Mar 2019 15:18:55 +0000 (07:18 -0800)]
[automerger skipped] Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am:
809231680f am:
21c4a58435
am:
499b803c52 -s ours
am skip reason: subject contains skip directive
Change-Id: I4771454a5cdfdd6641983f438139a97f216cec5c
Wyatt Riley [Mon, 4 Mar 2019 15:11:25 +0000 (07:11 -0800)]
Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am:
809231680f
am:
21c4a58435
Change-Id: I3d4e666268ac37f41c6d94e10f5e5e1f2928ef7f
WyattRiley [Mon, 4 Mar 2019 15:07:55 +0000 (07:07 -0800)]
[automerger skipped] [automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d am:
1c348395f5 am:
26fda93676 skipped:
cf76183e6c am:
cf81345649 am:
94029593c4
am:
c03d767ee8 -s ours
am skip reason: subject contains skip directive
Change-Id: If7999e30c065ed880e9c105c5ecb661cd8c8d79e
WyattRiley [Mon, 4 Mar 2019 15:02:56 +0000 (07:02 -0800)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d am:
1c348395f5 am:
26fda93676 skipped:
cf76183e6c am:
cf81345649
am:
94029593c4
Change-Id: I816c914fd79f9589efa0e6b587649cd6264113bc
Wyatt Riley [Mon, 4 Mar 2019 14:56:23 +0000 (06:56 -0800)]
Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev
am:
809231680f
Change-Id: If2f27dd775d4d5d543d23d10dcce10bc1bc4f51a
WyattRiley [Mon, 4 Mar 2019 14:51:02 +0000 (06:51 -0800)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d am:
1c348395f5 am:
26fda93676 skipped:
cf76183e6c
am:
cf81345649
Change-Id: I8f2f2edaaa607378d75e3c852d0b8cedbc4fbb67
Wyatt Riley [Mon, 4 Mar 2019 14:29:06 +0000 (14:29 +0000)]
Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev
Wyatt Riley [Mon, 4 Mar 2019 14:29:06 +0000 (14:29 +0000)]
Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into pi-dev
Bill Yi [Sat, 2 Mar 2019 10:12:29 +0000 (02:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iab1d4df902c4245f932febe720a06a7918ebc704
Tiger Huang [Wed, 27 Feb 2019 16:33:51 +0000 (00:33 +0800)]
DO NOT MERGE: Don't let previous activity wait if next activity won't be visible
If the next resumed activity won't be visible because of keyguard, it
doesn't make sense to let the previous activity wait for the next
activity becoming visible. Worse, it would make other activities going
to the stopped state need to wait unnecessarily.
Bug:
125550126
Bug:
124556520
Test: atest ActivityManagerDisplayLockedKeyguardTests
Change-Id: Id6f2e562c84b167b6736813ea6dc183536587d30
WyattRiley [Thu, 28 Feb 2019 20:05:56 +0000 (12:05 -0800)]
DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot
Safe order of pointer setting and background thread start
Verifying mCallEndElapsedRealtimeMillis is not the initial value
Bug:
112159033
Bug:
115361555
Bug:
125124724
Test: Verified not-after-boot with test code b/
115361555#comment14
Test: Reproed NPE with test thread sleep and verify fix
Change-Id: I25dcd5a5b36c218ea8b7ab88d6909382709fd7ab
WyattRiley [Thu, 28 Feb 2019 19:43:12 +0000 (11:43 -0800)]
DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot
Safe order of pointer setting and background thread start
Verifying mCallEndElapsedRealtimeMillis is not the initial value
Bug:
112159033
Bug:
115361555
Bug:
125124724
Test: Verified not-after-boot with test code b/
115361555#comment14
Test: Reproed NPE with test thread sleep and verify fix
Change-Id: Icd2ea91d71da71c8fda109ceb70514733d35060b
Android Build Merger (Role) [Fri, 1 Mar 2019 21:01:49 +0000 (21:01 +0000)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d am:
1c348395f5 am:
26fda93676 skipped:
cf76183e6c
Change-Id: Ifd0a52ac469b9d59aa43b3849b5cfbabeac99ed5
Android Build Merger (Role) [Fri, 1 Mar 2019 21:01:39 +0000 (21:01 +0000)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d am:
1c348395f5 am:
26fda93676
Change-Id: I87431bd661f6d5243d4c442e3caf6db247dc89bd
Android Build Merger (Role) [Fri, 1 Mar 2019 21:01:31 +0000 (21:01 +0000)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d am:
1c348395f5
Change-Id: I5c7df1fd86ece1f84fba51250568a0d049b591f9
Android Build Merger (Role) [Fri, 1 Mar 2019 21:01:22 +0000 (21:01 +0000)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d
Change-Id: I0499fab6407457adb226a0fef751e22c9566179f
Android Build Merger (Role) [Fri, 1 Mar 2019 21:01:11 +0000 (21:01 +0000)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8
Change-Id: I6a05a6ca8ad3313c901a2ad692851d2096b21e7b
WyattRiley [Tue, 19 Feb 2019 21:19:13 +0000 (13:19 -0800)]
DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot
Safe order of pointer setting and background thread start
Verifying mCallEndElapsedRealtimeMillis is not the initial value
Bug:
112159033
Bug:
115361555
Bug:
125124724
Test: Verified not-after-boot with test code b/
115361555#comment14
Test: Reproed NPE on Nexus 5x with test thread sleep and verify fix
Change-Id: I596f913bc79873274c2743132c93ef2381d9f3c7
Varun Anand [Thu, 7 Feb 2019 22:13:13 +0000 (14:13 -0800)]
Remove ConnectivityManager and its usages from NetworkStatsService.
NSS needed it for getting VpnInfo[], NetworkState[] and
activeLinkProperties which it used to query via ConnectivityManager.
For VpnInfo[], this was racy as NSS may ignore intermediate changes to a
VPN's underlying networks. See http://b/
123961098 for more context.
It may also lead to deadlocks b/w ConnectivityService and
NetworkStatsService. See http://b/
126245192 for more info.
This change will ensure that NSS is never contending on any of
ConnectivityService locks.
This change also is cherry-picking cleanup made to NSS in
http://aosp/628368.
Bug:
123961098
Bug:
126245192
Bug:
120145746
Test: atest FrameworksNetTests
Change-Id: Ia687845888434c8ddd24bdf44b4c70dfe80e03f5
Merged-In: I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6
TreeHugger Robot [Tue, 26 Feb 2019 23:35:10 +0000 (23:35 +0000)]
Merge "DO NOT MERGE: Disable night UI mode in battery saver." into pi-dev
Dan Sandler [Mon, 25 Feb 2019 23:26:04 +0000 (18:26 -0500)]
DO NOT MERGE: Disable night UI mode in battery saver.
Apps are simply not ready for this.
Bug:
122968431
Test: Toggle battery saver; confirm that a config change is not generated
Change-Id: I792d42e31254c8189e95c3f076b9eaea893209a6
Qasid Sadiq [Fri, 22 Feb 2019 23:43:54 +0000 (23:43 +0000)]
Merge "Revert "Fix a11y cache correctness bug"" into pi-dev
Mikhail Naganov [Fri, 22 Feb 2019 22:55:06 +0000 (22:55 +0000)]
Merge "Visualizer: fix native crash when visualizer release" into pi-dev
zengjing [Sat, 29 Sep 2018 05:19:15 +0000 (13:19 +0800)]
Visualizer: fix native crash when visualizer release
Visualizer should not be destroyed before mCaptureThread exit.
Bug:
124833084
Test: CTS VisualizerTest
Change-Id: I0cda2ff2be8ce487e10b5311fbdc043fa57d91d4
Merged-In: I0cda2ff2be8ce487e10b5311fbdc043fa57d91d4
Signed-off-by: zengjing <zengjing@xiaomi.com>
Bill Lin [Fri, 22 Feb 2019 12:10:00 +0000 (12:10 +0000)]
Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature" into pi-dev
Qasid Ahmad Sadiq [Fri, 22 Feb 2019 05:06:22 +0000 (21:06 -0800)]
Revert "Fix a11y cache correctness bug"
This fix introduced a painful crash that ends up disabling accessibility
services for certain users.
This happens when a client of AccessibilityCache tries to add a node, with the same id as a node previously in the cache, but fewer children, where the removed child is not in the cache.
This is because, when children are removed, and a the node is updated, the cache tries to clear the child trees. But if the child is not in the cache, the cache clears the whole tree. Every node is recycled.
Then the original node being replaced is attempted to be recycled again, and voila crash.
The fix also didn't fix the original issue based on the discussion in
b/
114133438.
The risk for this is pretty low, since nothing was built on top of this.
This reverts commit
2f69c16c3dd0ea9522deebd9141ccc189b4a118e.
Bug:
124676705
Test: Tested to see if above usecase still happens.
Change-Id: I8a39698c4532a1613ba47e1c6ca70201cd496212
TreeHugger Robot [Fri, 22 Feb 2019 01:40:49 +0000 (01:40 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Thu, 21 Feb 2019 20:25:26 +0000 (12:25 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If0bc0cddb97e786602b5be83f1a165ad6c94ef9c
TreeHugger Robot [Thu, 21 Feb 2019 18:42:40 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Daniel Sandler [Thu, 21 Feb 2019 18:27:45 +0000 (18:27 +0000)]
Merge "Skip empty slice permissions files during backup" into pi-dev
Daniel Sandler [Thu, 21 Feb 2019 18:27:36 +0000 (18:27 +0000)]
Merge "Make notifications from the default dialer and SMS app unblockable." into pi-dev
TreeHugger Robot [Thu, 21 Feb 2019 04:32:58 +0000 (04:32 +0000)]
Merge "Clarify WebResourceResponse's stream handling." into pi-dev
Lucas Dupin [Wed, 20 Feb 2019 20:26:25 +0000 (20:26 +0000)]
Merge "Improve the performance when loading image wallpaper colors" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 20:09:39 +0000 (20:09 +0000)]
Merge "Override old alarms in zen schedule" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 19:39:41 +0000 (19:39 +0000)]
Merge "Update VPN capabilities when its underlying network set is null." into pi-dev
OSDN Git Service
