OSDN Git Service
Jeff Sharkey [Wed, 20 Feb 2019 23:59:05 +0000 (23:59 +0000)]
Merge "Temporary workaround to grant Storage permission."
Amith Yamasani [Wed, 20 Feb 2019 23:47:11 +0000 (23:47 +0000)]
Merge "Use the calling uid, not app id"
TreeHugger Robot [Wed, 20 Feb 2019 23:44:26 +0000 (23:44 +0000)]
Merge "Add CompositionSamplingListener"
Sasha Smundak [Wed, 20 Feb 2019 23:39:48 +0000 (15:39 -0800)]
[automerger skipped] Merge "Convert Android.mk file to Android.bp" am:
4b5b191b42 am:
1cdaea76a4
am:
defe724c7d -s ours
am skip reason: change_id I4ccc0a2e13fc49a0109e9823fbcb4077e11455d5 with SHA1
df848ac224 is in history
Change-Id: I3602771542d0338ed059d6b87005ff5d2da167b2
Nathan Harold [Wed, 20 Feb 2019 23:29:45 +0000 (15:29 -0800)]
Merge "Debug Event for Malformed PLMN ID in CellIdentity" am:
5ea5f198c0 am:
e34afe3541
am:
eaa8c47c4c
Change-Id: I00e78cf34f0d3644f69c7ea91154fecea3515cf5
Shuo Qian [Wed, 20 Feb 2019 23:24:35 +0000 (23:24 +0000)]
Merge "Add Prefix per Carrier requirement"
Sasha Smundak [Wed, 20 Feb 2019 23:03:58 +0000 (15:03 -0800)]
Merge "Convert Android.mk file to Android.bp" am:
4b5b191b42
am:
1cdaea76a4
Change-Id: Ic093e88ba7b644239253952c3326c25309ecbfcd
Olivier Gaillard [Wed, 20 Feb 2019 23:02:57 +0000 (23:02 +0000)]
Merge "Introduces an option to set a dump latency requirement."
Nathan Harold [Wed, 20 Feb 2019 22:51:42 +0000 (14:51 -0800)]
Merge "Debug Event for Malformed PLMN ID in CellIdentity" am:
5ea5f198c0
am:
e34afe3541
Change-Id: I8689e2e91dc3dac8499aec09b34ad67a6bde307b
TreeHugger Robot [Wed, 20 Feb 2019 22:31:40 +0000 (22:31 +0000)]
Merge "Add rtmitchell to idmap2 OWNERS"
TreeHugger Robot [Wed, 20 Feb 2019 22:31:06 +0000 (22:31 +0000)]
Merge "Suppress cert-dcl50-cpp tidy warnings."
TreeHugger Robot [Wed, 20 Feb 2019 22:13:54 +0000 (22:13 +0000)]
Merge "Throw IllegalArgumentException for invalid foregroundServiceType."
Sasha Smundak [Wed, 20 Feb 2019 22:12:37 +0000 (14:12 -0800)]
Merge "Convert Android.mk file to Android.bp"
am:
4b5b191b42
Change-Id: Ibd2b03c24eee63d2f270626ebce1d4b508f0d4cf
Leland Miller [Wed, 20 Feb 2019 22:10:06 +0000 (14:10 -0800)]
Merge "Split RCS events into API and internal classes" am:
609ea873b7 am:
7b46efda19
am:
720a31725d
Change-Id: Id2d914dcb2088ea676c448ff7068ac7229913182
Makoto Onuki [Wed, 20 Feb 2019 22:06:05 +0000 (22:06 +0000)]
Merge "Fix boost charging, also expose test API"
Nathan Harold [Wed, 20 Feb 2019 22:00:07 +0000 (14:00 -0800)]
Merge "Debug Event for Malformed PLMN ID in CellIdentity"
am:
5ea5f198c0
Change-Id: I369199cc54afc5e49cc267bba17437437c1261df
TreeHugger Robot [Wed, 20 Feb 2019 21:42:32 +0000 (21:42 +0000)]
Merge "Exposing MotionEvent.addBatch method to be used in Launcher"
TreeHugger Robot [Wed, 20 Feb 2019 21:36:58 +0000 (21:36 +0000)]
Merge "Make ImageDecoder.setTargetColorSpace to EXTENDED promote to F16"
Jeff Sharkey [Wed, 20 Feb 2019 21:20:58 +0000 (14:20 -0700)]
Temporary workaround to grant Storage permission.
We have logic that automatically grants the legacy "Storage"
permission when the user grants either of the new "Music" or
"Photos & Videos" permissions, but that logic only lives in
PermissionController, and does not apply to pre-grants.
As a temporary workaround, explicitly grant the "Storage"
permission in pre-grants until we can refactor the
PermissionController logic.
Bug:
124466734
Test: manual
Change-Id: Ic3b07e82092a9100aea89263a1175d9fe2284382
Lucas Dupin [Wed, 20 Feb 2019 21:19:18 +0000 (13:19 -0800)]
[automerger skipped] Merge "Merge "Improve the performance when loading image wallpaper colors" into pi-dev am:
98684aa82a" into pi-dev-plus-aosp
am:
ac89f2e5f9 -s ours
am skip reason: change_id I8589b28a17b0a2b33b4bbbda2265080af983f26a with SHA1
0e490d9e77 is in history
Change-Id: I456dc392f8b0dbb1092bb8e4913cf9aa127969e8
Nathan Harold [Wed, 20 Feb 2019 21:10:40 +0000 (13:10 -0800)]
Merge "Expose the Radio HAL Version for Test Purposes" am:
a6dda25ac9 am:
225ef93d21
am:
0025fc3286
Change-Id: I3fb947c31e5a6fb46d0216fed77e8655ac43492f
Treehugger Robot [Wed, 20 Feb 2019 21:08:21 +0000 (21:08 +0000)]
Merge "Convert Android.mk file to Android.bp"
Nathan Harold [Wed, 20 Feb 2019 21:08:05 +0000 (21:08 +0000)]
Merge "Debug Event for Malformed PLMN ID in CellIdentity"
Nathan Harold [Wed, 13 Feb 2019 00:13:34 +0000 (16:13 -0800)]
Debug Event for Malformed PLMN ID in CellIdentity
Add a debug event to catch the case where the modem
reports a PLMN-ID that is either malformed or incomplete.
Bug:
124332651
Test: compilation
Change-Id: Iffea47349ff999aade2aa26e30f00e5007ba7b4e
Leland Miller [Wed, 20 Feb 2019 21:05:37 +0000 (13:05 -0800)]
Merge "Split RCS events into API and internal classes" am:
609ea873b7
am:
7b46efda19
Change-Id: I2fc31c0fdc1e8eb203830dff9a7914e56ebda413
Beverly [Wed, 20 Feb 2019 21:03:38 +0000 (13:03 -0800)]
[automerger skipped] Merge "Override old alarms in zen schedule" into pi-dev am:
2ab75b2b2e
am:
0a9b851293 -s ours
am skip reason: change_id I371a586d470e3e341a42fb5ae3b8f32929214c18 with SHA1
4e76191a9f is in history
Change-Id: I00ecfc315a3edd07b8f497410f2748e748823a73
Susi Kharraz-Post [Wed, 20 Feb 2019 21:00:39 +0000 (21:00 +0000)]
Merge "Add tron logging for phone orientation"
Android Build Merger (Role) [Wed, 20 Feb 2019 20:44:43 +0000 (20:44 +0000)]
Merge "Merge "Improve the performance when loading image wallpaper colors" into pi-dev am:
98684aa82a" into pi-dev-plus-aosp
Lucas Dupin [Wed, 20 Feb 2019 20:43:52 +0000 (12:43 -0800)]
Merge "Improve the performance when loading image wallpaper colors" into pi-dev
am:
98684aa82a
Change-Id: I4ff2e38dc3f40ccf6289ffbee69eed23c96fa4dc
Nathan Harold [Wed, 20 Feb 2019 20:42:50 +0000 (12:42 -0800)]
Merge "Expose the Radio HAL Version for Test Purposes" am:
a6dda25ac9
am:
225ef93d21
Change-Id: Ie4b60e4ba25b69eaef298887ca803b428620e33d
TreeHugger Robot [Wed, 20 Feb 2019 20:42:05 +0000 (20:42 +0000)]
Merge "Add some @IntRange"
Leland Miller [Wed, 20 Feb 2019 20:41:57 +0000 (12:41 -0800)]
Merge "Split RCS events into API and internal classes"
am:
609ea873b7
Change-Id: Ic12e2ce7ba5fbc576fc2537204049a28828ec4e7
Varun Anand [Wed, 20 Feb 2019 20:36:39 +0000 (12:36 -0800)]
[automerger skipped] Merge "Update VPN capabilities when its underlying network set is null." into pi-dev am:
b4b64ad602 -s ours
am:
1eaff3f103 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1
4fa80e8a2f is in history
Change-Id: Icab5d7a43a26be9a4c2d01279453571062b2a808
Beverly [Wed, 20 Feb 2019 20:29:58 +0000 (12:29 -0800)]
Merge "Override old alarms in zen schedule" into pi-dev
am:
2ab75b2b2e
Change-Id: I8db691e85b738d2d7821de715e124c1e3ce3b913
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
Nathan Harold [Wed, 20 Feb 2019 20:21:51 +0000 (12:21 -0800)]
Merge "Expose the Radio HAL Version for Test Purposes"
am:
a6dda25ac9
Change-Id: Iaa0a92f6816779ee1e80521c4b5152c8b68a3ba4
Varun Anand [Wed, 20 Feb 2019 20:14:20 +0000 (12:14 -0800)]
[automerger skipped] Merge "Update VPN capabilities when its underlying network set is null." into pi-dev
am:
b4b64ad602 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1
4fa80e8a2f is in history
Change-Id: I8cdd422bf5686c707d60137eccb4e1caae8194a3
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 20:01:14 +0000 (20:01 +0000)]
Merge "Split RCS events into API and internal classes"
Sunny Goyal [Wed, 20 Feb 2019 18:44:51 +0000 (10:44 -0800)]
Exposing MotionEvent.addBatch method to be used in Launcher
Test: Verified library in Launcher
Change-Id: Idd58082d75310a15ed2196917f1a9e9e42f82d45
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
TreeHugger Robot [Wed, 20 Feb 2019 19:32:44 +0000 (19:32 +0000)]
Merge "Adds unit tests for RescueParty."
Xin Li [Wed, 20 Feb 2019 19:26:07 +0000 (11:26 -0800)]
[automerger skipped] Merge changes from topic "PPRL.190205.001" am:
4ba3b12efb -s ours am:
1e8a0c8d89 -s ours
am:
5755d6ad39 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
afc94d724c is in history
Change-Id: I9d0dd19c248b350d12233c4d9a71a30659021388
Sasha Smundak [Fri, 8 Feb 2019 23:13:25 +0000 (15:13 -0800)]
Convert Android.mk file to Android.bp
See build/soong/README.md for more information.
Bug:
122332340
Test: treehugger
Change-Id: I4ccc0a2e13fc49a0109e9823fbcb4077e11455d5
Merged-In: I4ccc0a2e13fc49a0109e9823fbcb4077e11455d5
Varun Anand [Wed, 6 Feb 2019 18:13:38 +0000 (10:13 -0800)]
Update VPN capabilities when its underlying network set is null.
Previously, they were only updated when underlying network set was
non-null.
This change also ensures that all the calls b/w ConnectivityService and
Vpn that leads to updating capabilities are on ConnectivityService
handler thread.
Additionally, it also ensures that capabilities are propagated after VPN
enters connected state.
This change also updates VPN capabilities inline from
ConnectivityService handler thread. Previously, there was an additional
loop where Vpn would update capabilities via NetworkAgent thru
AsyncChannel which posts back to CS handler thread, which could
potentially lead to delays in updating VPN capabilities.
Bug:
119129310
Bug:
118856062
Bug:
124268198
Test: atest FrameworksNetTests
Test: manual - verified VPNs capabilities are getting updated and
DownloadManager is working correctly.
(cherry picked from commit
4fa80e8a2f03557221e0371a987e780df7788faa)
Change-Id: Iae5f2024b19df04c31938815b52687781d016cde
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
Xin Li [Wed, 20 Feb 2019 18:36:50 +0000 (10:36 -0800)]
[automerger skipped] Merge changes from topic "PPRL.190205.001" am:
4ba3b12efb -s ours
am:
1e8a0c8d89 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: If0a545f1a09f0a4471f2c6adadfe79ad434bebd4
Hui Yu [Wed, 20 Feb 2019 18:34:27 +0000 (10:34 -0800)]
Throw IllegalArgumentException for invalid foregroundServiceType.
Throw IllegalArgumentException if the passed-in foregroundServiceType
is not a subset of foregroundServiceType flags of service element in
manifest file.
Change-Id: I267f76f6a1633a35f0a20db60999f61de13b4b20
Fix:
120611119
Test: NA
Amith Yamasani [Wed, 20 Feb 2019 17:31:58 +0000 (09:31 -0800)]
Use the calling uid, not app id
Use the calling uid, when checking permissions,
since the target app may not exist in the system user.
This allows apps in the work profile to request
BROADCAST_STICKY permission, for instance.
Fixes:
121274063
Test: Manually test failing apps in work profile
Change-Id: I326f504a482623a7db624b4d7779423c6a17e4d1
Ryan Mitchell [Wed, 20 Feb 2019 18:31:08 +0000 (10:31 -0800)]
Add rtmitchell to idmap2 OWNERS
Change-Id: I8e0b873ef8739aadbb4f3bd6a7c3f4aa1aee58ea
Android Build Merger (Role) [Wed, 20 Feb 2019 18:29:44 +0000 (18:29 +0000)]
Merge "Merge "[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev am:
31a61f6348 -s ours am:
f43dd2bd13 -s ours am:
ee4cb4f1ee -s ours am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
afc94d724c is in history"
John Reck [Wed, 20 Feb 2019 18:23:41 +0000 (10:23 -0800)]
Add some @IntRange
IntRange just matches what would have resulted in an
IllegalArgumentException, no new restrictions
Fixes:
124767261
Test: N/A
Change-Id: Iad04587f2c10008798098fc56481e45de4c64c0b
TreeHugger Robot [Wed, 20 Feb 2019 18:25:21 +0000 (18:25 +0000)]
Merge changes from topic "glwallpaper_cleanup"
* changes:
Remove AOD_IMAGEWALLPAPER_ENABLED from feature flags
Remove DrawableEngine and related logics
Dan Shi [Wed, 20 Feb 2019 18:18:56 +0000 (18:18 +0000)]
Merge "Reduce CtsRoleTestCases to postsubmit as the test becomes too flaky"
Xin Li [Wed, 20 Feb 2019 18:17:48 +0000 (10:17 -0800)]
[automerger skipped] Merge changes from topic "PPRL.190205.001"
am:
4ba3b12efb -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: Ieb824b633f240abc96ee25f39c68f55f1bd621bd
TreeHugger Robot [Wed, 20 Feb 2019 18:16:13 +0000 (18:16 +0000)]
Merge "Add visibility config for assistant, home and emergency role."
Raman Tenneti [Wed, 20 Feb 2019 18:05:08 +0000 (10:05 -0800)]
Merge "[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev am:
31a61f6348 -s ours am:
f43dd2bd13 -s ours
am:
ee4cb4f1ee -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
afc94d724c is in history
Change-Id: If55cdbe094fb4409f20762109090361a11614768
Susi Kharraz-Post [Tue, 12 Feb 2019 19:21:29 +0000 (14:21 -0500)]
Add tron logging for phone orientation
Knowing the orientation (landscape vs. portrait) of the phone is a
useful aspect of to know when interpreting user phone interaction. Among
the usecases is analysis of share behavior.
Bug:
122511750
Test: Added unit test in DisplayContentTests.java
Change-Id: Ibf1e2040e2eb082580e1c4a65cf242870460f1ef
TreeHugger Robot [Wed, 20 Feb 2019 18:00:28 +0000 (18:00 +0000)]
Merge "API adjustments for Picture serialization discussion"
Olivier Gaillard [Wed, 20 Feb 2019 09:57:33 +0000 (09:57 +0000)]
Introduces an option to set a dump latency requirement.
We are currently dumping invalid data for pulled metrics. Pulled metrics
require a new pull when flushing a bucket. We should either do another
pull or invalidate the previous bucket.
There are cases where we cannot afford to do another pull, e.g. statsd
being killed. If we do not have enough time, we'll just invalidte the
bucket to make sure we have correct data.
Bug:
123866830
Test: atest statsd_test
Change-Id: I090127cace3b7265032ebb2c9bddae976c883771
TreeHugger Robot [Wed, 20 Feb 2019 17:55:44 +0000 (17:55 +0000)]
Merge "Make Bitmap#copy docs more accurate"
Nataniel Borges [Wed, 20 Feb 2019 17:52:19 +0000 (17:52 +0000)]
Merge "Add window trace status to the bug report"
Nathan Harold [Wed, 20 Feb 2019 17:50:41 +0000 (17:50 +0000)]
Merge "Expose the Radio HAL Version for Test Purposes"
TreeHugger Robot [Wed, 20 Feb 2019 17:46:43 +0000 (17:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Android Build Merger (Role) [Wed, 20 Feb 2019 17:45:02 +0000 (17:45 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
31dccf9f69 -s ours am:
67619a4e57 -s ours am skip reason: subject contains skip directive"
Bill Yi [Wed, 20 Feb 2019 17:44:14 +0000 (09:44 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
31dccf9f69 -s ours
am:
67619a4e57 -s ours
am skip reason: subject contains skip directive
Change-Id: I7fd8c2a31a12097daa87dce02b0494106f2a6a49
Android Build Merger (Role) [Wed, 20 Feb 2019 17:44:03 +0000 (17:44 +0000)]
Merge "[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev am:
31a61f6348 -s ours am:
f43dd2bd13 -s ours am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history" into pi-dev-plus-aosp
Mathew Inwood [Wed, 20 Feb 2019 17:43:42 +0000 (17:43 +0000)]
Merge "Move the right method to max-sdk-o list."
Adam He [Wed, 20 Feb 2019 17:39:19 +0000 (17:39 +0000)]
Merge "Fixed autofill workflow to call onConnected before handling pending requests."
Bill Yi [Wed, 20 Feb 2019 17:39:09 +0000 (09:39 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
31dccf9f69 -s ours
am skip reason: subject contains skip directive
Change-Id: Idcd32e03f038d9f6ae5df7b54fad8c0f7ef6b4a3
Dan Shi [Wed, 20 Feb 2019 17:31:47 +0000 (09:31 -0800)]
Reduce CtsRoleTestCases to postsubmit as the test becomes too flaky
Bug:
123376916
Test: none
Change-Id: Ibd53c2083b534e24d4cf0694fdb7421b3b703c42
Raman Tenneti [Wed, 20 Feb 2019 17:24:20 +0000 (09:24 -0800)]
[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev am:
31a61f6348 -s ours
am:
f43dd2bd13 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: I3659d3c7be000deb90c28967e621ca3a8989374e
Max Bires [Wed, 20 Feb 2019 17:21:22 +0000 (17:21 +0000)]
Merge "Adding KEY_PERMANENTLY_INVALIDATED int"
TreeHugger Robot [Wed, 20 Feb 2019 17:19:48 +0000 (17:19 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 17:19:38 +0000 (17:19 +0000)]
Merge "Disable APEX install on unsupported devices."
TreeHugger Robot [Wed, 20 Feb 2019 17:12:43 +0000 (17:12 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 20 Feb 2019 17:05:37 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE"
Christine Franks [Wed, 20 Feb 2019 17:01:55 +0000 (17:01 +0000)]
Merge "Remove ColorDisplayController"
Sam Lin [Wed, 20 Feb 2019 16:52:38 +0000 (16:52 +0000)]
Merge "Disables display content scaling for foldables"
Raman Tenneti [Wed, 20 Feb 2019 16:48:13 +0000 (08:48 -0800)]
[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
am:
31a61f6348 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: I76722b24202892034148a1c1030b8ca4d3417797
Android Build Merger (Role) [Wed, 20 Feb 2019 16:41:14 +0000 (16:41 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
85288a5e3c -s ours am:
54d5947793 -s ours am skip reason: subject contains skip directive"
TreeHugger Robot [Wed, 20 Feb 2019 16:40:21 +0000 (16:40 +0000)]
Merge "Move TextClassifier.getLocalTextClassifier() API."
Bill Yi [Wed, 20 Feb 2019 16:40:18 +0000 (08:40 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
85288a5e3c -s ours
am:
54d5947793 -s ours
am skip reason: subject contains skip directive
Change-Id: I8e524ba33fe382b607d9cb40e0cb66c6054b35b0
Bill Yi [Wed, 20 Feb 2019 16:35:59 +0000 (08:35 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
85288a5e3c -s ours
am skip reason: subject contains skip directive
Change-Id: Iec829f315ae6c99cf4ab5b9f1f6e68b5d8f39a3f
Bill Yi [Wed, 20 Feb 2019 16:35:35 +0000 (08:35 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
e937b2703e -s ours
am:
0f70b8c4f7 -s ours
am skip reason: subject contains skip directive
Change-Id: I2d29e0bd50a1cade1644abb8f736af7210e13307
Bill Yi [Wed, 20 Feb 2019 16:34:08 +0000 (08:34 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
93f661ab3b -s ours
am:
5556496511 -s ours
am skip reason: subject contains skip directive
Change-Id: Ica98dad1198d21d4205e0c928c0e077d5969c67f
Dario Freni [Wed, 20 Feb 2019 16:30:59 +0000 (16:30 +0000)]
Merge "Support split APKs in staged installs."
Bill Yi [Wed, 20 Feb 2019 16:29:00 +0000 (08:29 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e937b2703e -s ours
am skip reason: subject contains skip directive
Change-Id: Ic06d9c19e9213965262889d5b7f56b84751e9592
Bill Yi [Wed, 20 Feb 2019 16:27:16 +0000 (08:27 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
93f661ab3b -s ours
am skip reason: subject contains skip directive
Change-Id: I7305d8553060fc8b48ff33bb717c579e353fbaea
Xin Li [Wed, 20 Feb 2019 16:25:58 +0000 (16:25 +0000)]
Merge changes from topic "PPRL.190205.001"
* changes:
Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
DO NOT MERGE - Merge PPRL.190205.001 into master
TreeHugger Robot [Wed, 20 Feb 2019 16:25:17 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 16:20:24 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 16:14:10 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jeff Sharkey [Wed, 20 Feb 2019 16:13:23 +0000 (16:13 +0000)]
Merge "Temporarily grant legacy storage to certain apps."
Andreas Gampe [Wed, 20 Feb 2019 15:54:27 +0000 (15:54 +0000)]
Merge "Services: Add more PMS presubmits"
TreeHugger Robot [Wed, 20 Feb 2019 15:51:59 +0000 (15:51 +0000)]
Merge "Changes on the ContentCaptureContext APIs."
TreeHugger Robot [Wed, 20 Feb 2019 15:51:52 +0000 (15:51 +0000)]
Merge "Don't lock WM when calling ActivityStackSupervisor.resolveIntent()"
Android Build Merger (Role) [Wed, 20 Feb 2019 15:31:59 +0000 (15:31 +0000)]
Merge "[automerger skipped] Merge "Use sampled value in hidden api logger" am:
619ed85e81 am:
818e8c1bf2 am:
98b52faf43 -s ours am skip reason: change_id I707a2624a254a80391cdae277dd59daa503d055f with SHA1
31bde16393 is in history"
Andrei-Valentin Onea [Wed, 20 Feb 2019 15:30:08 +0000 (07:30 -0800)]
[automerger skipped] Merge "Use sampled value in hidden api logger" am:
619ed85e81 am:
818e8c1bf2
am:
98b52faf43 -s ours
am skip reason: change_id I707a2624a254a80391cdae277dd59daa503d055f with SHA1
31bde16393 is in history
Change-Id: I8aacdc0e9c6c579941c4e3a56211800464dbbda7
TreeHugger Robot [Wed, 20 Feb 2019 15:22:58 +0000 (15:22 +0000)]
Merge "Add API comment for new API in WallpaperService."
Andrei-Valentin Onea [Wed, 20 Feb 2019 15:15:07 +0000 (07:15 -0800)]
Merge "Use sampled value in hidden api logger" am:
619ed85e81
am:
818e8c1bf2
Change-Id: I2cb5ac6bfae6cc98398688a4b5695260a863578a