Automerger Merge Worker
39e2fdf7b6
Merge "Add UCE Call Composer + enriched calling tags" am: feaed68912 am: 8e637e628f am: cedaa4b578
...
Change-Id: I83fed5453b5033ea2cc2e9d15b7a9614b2718cab
2020-01-17 22:30:57 +00:00
Automerger Merge Worker
a29bd81987
[automerger skipped] Merge "DO NOT MERGE: Add support to send notification from Zygote to system_server" am: 54469bf6ff am: 07dc8cd0f8 am: d7c889b44e -s ours
...
am skip reason: subject contains skip directive
Change-Id: Icc360bacdca45742f5facc18d8175ff50408db1d
2020-01-17 22:30:21 +00:00
Automerger Merge Worker
951dc547ec
[automerger skipped] Merge "API: Supress existing inconsistent Context service names" am: 3b35f3dfef am: 72bb1fa6c2 am: eb32107eda -s ours
...
am skip reason: Change-Id I1f140dc172a405fed52f0f8d6c16f2f730ab89be with SHA-1 d38f509e90
2020-01-17 22:28:29 +00:00
Automerger Merge Worker
c0c4d4c2f1
Merge "Add option to avoid clobbering visibility of <declare-styleable>" am: 7b56a5075d am: 002ba59e2b am: ca5be49926
...
Change-Id: I51191b227424de562f425f10e3441bee990afbe9
2020-01-17 22:26:55 +00:00
Automerger Merge Worker
ab6f975a5d
Merge "Track addition of Flow.* to the public API." am: 2120eced38 am: 7c6e1b2357 am: edf63555d0
...
Change-Id: Iee19cd18f61ec5b7572e0aa71468110ea1b370e5
2020-01-17 22:26:17 +00:00
Automerger Merge Worker
4ca521788d
[automerger skipped] Merge "Properly catch ServiceSpecificException if IMS isn't available" am: ba0576ee28 am: a21832405f am: 225b5fc847 -s ours
...
am skip reason: Change-Id I4033659acb0031e2383ebcff55c1bb0798041abd with SHA-1 fee1f36a08
2020-01-17 22:25:57 +00:00
Automerger Merge Worker
cedaa4b578
Merge "Add UCE Call Composer + enriched calling tags" am: feaed68912 am: 8e637e628f
...
Change-Id: I2abc0d201c828e198eae5f366112803e5d568dd4
2020-01-17 22:21:21 +00:00
Automerger Merge Worker
d7c889b44e
Merge "DO NOT MERGE: Add support to send notification from Zygote to system_server" am: 54469bf6ff am: 07dc8cd0f8
...
Change-Id: I5181c73e996f86853fa354b44a64a76bac3ea388
2020-01-17 22:19:40 +00:00
Automerger Merge Worker
eb32107eda
Merge "API: Supress existing inconsistent Context service names" am: 3b35f3dfef am: 72bb1fa6c2
...
Change-Id: Iefaa20526372406ecd043c5b4b3895a98163fcb7
2020-01-17 22:18:54 +00:00
Todd Kennedy
b38fdd3d33
Merge "Keep old package manager constructor"
2020-01-17 22:18:51 +00:00
Automerger Merge Worker
ca5be49926
Merge "Add option to avoid clobbering visibility of <declare-styleable>" am: 7b56a5075d am: 002ba59e2b
...
Change-Id: I151857468d1a35bae8396e612c0a17cbcdf5dea1
2020-01-17 22:17:16 +00:00
Automerger Merge Worker
edf63555d0
Merge "Track addition of Flow.* to the public API." am: 2120eced38 am: 7c6e1b2357
...
Change-Id: I075bd3eba3f253a23a2a39d4af01ac96685170e8
2020-01-17 22:16:31 +00:00
Automerger Merge Worker
b902b37bb6
Merge "Revert "Revert "Add method to enforce READ_PRECISE_PHONE_STATE p..."" am: 55f9664eb3 am: ba526d50c9 am: a4ba1c1a47
...
Change-Id: I87a79941758ba646ec3f777d89d5a296eb9876ce
2020-01-17 22:16:16 +00:00
Automerger Merge Worker
4358533bd6
Merge "Annotate StringNetworkSpecifier @Deprecated and @removed" am: bd5a33f03b am: df2c3924ea am: 9f280c19b4
...
Change-Id: Idc06ad7587362f58f97c5d5d9f639bc30f2e9f26
2020-01-17 22:15:58 +00:00
Automerger Merge Worker
a3ee569dc1
Merge "Track addition of new java.util APIs." am: 00d0c52470 am: c050446807 am: 43b4913836
...
Change-Id: I7c99241a9c13dffc28f0fad475cb1545360069fc
2020-01-17 22:15:26 +00:00
Automerger Merge Worker
225b5fc847
Merge "Properly catch ServiceSpecificException if IMS isn't available" am: ba0576ee28 am: a21832405f
...
Change-Id: I7b61a3780b81fcc112ed3599a486b64258f47ed1
2020-01-17 22:15:04 +00:00
Automerger Merge Worker
19b1cb8c8b
Merge "Tweak compat change override policy" am: 880792723a am: 3388e4181f am: f06eca1668
...
Change-Id: I434cbf4d32ecd3e79edb501c823e04c12583e85b
2020-01-17 22:15:01 +00:00
Automerger Merge Worker
56a121eeb5
[automerger skipped] Merge "Merge changes from topic "apps_to_system_ext" am: 046d939399" into stage-aosp-master am: 07435d063d -s ours am: b2ec7a0374 -s ours
...
am skip reason: Change-Id I0662674a66bc54ee4713e5c7ed6ad0db4d342338 with SHA-1 665595541e
2020-01-17 22:13:35 +00:00
Tom Taylor
086de218b9
Merge "Let sms app pass a logging id to telephony"
2020-01-17 22:11:53 +00:00
Automerger Merge Worker
3b6b6ed367
[automerger skipped] Merge changes from topic "apps_to_system_ext" am: 046d939399 am: b09797a099 -s ours am: 4614b5ab3f -s ours
...
am skip reason: Change-Id I0662674a66bc54ee4713e5c7ed6ad0db4d342338 with SHA-1 665595541e
2020-01-17 22:11:27 +00:00
Automerger Merge Worker
fa5006b7eb
Merge "Implement the ThreadPrioritySetter interface" am: 28aec752bd am: dc2aaef2e6 am: e6f0fa0b63
...
Change-Id: Ie2ea9aa627f2eb187b68af1226bf541458485455
2020-01-17 22:10:49 +00:00
Automerger Merge Worker
a4ba1c1a47
Merge "Revert "Revert "Add method to enforce READ_PRECISE_PHONE_STATE p..."" am: 55f9664eb3 am: ba526d50c9
...
Change-Id: Ie0809641be9de560d0efb9c3bf4cc8289b043300
2020-01-17 22:09:49 +00:00
Automerger Merge Worker
0d7c68a81a
[automerger skipped] Merge changes from topic "apps_to_system_ext" am: 046d939399 am: 8d3f32ccdc am: bb1ab48fdc -s ours
...
am skip reason: Change-Id I0662674a66bc54ee4713e5c7ed6ad0db4d342338 with SHA-1 665595541e
2020-01-17 22:04:41 +00:00
Automerger Merge Worker
3b56b6e8b3
[automerger skipped] Set sdk_version "current" in test package am: e88936689e am: 4b48dfe36d am: a694b9ee4d -s ours
...
am skip reason: Change-Id I3f5a164703f0e5a1f7d43b9f28cda7fa99033186 with SHA-1 3e077caaad
2020-01-17 22:04:38 +00:00
Automerger Merge Worker
72941b07b7
[automerger skipped] Move the permission.xml to /system_ext am: 45ebd05bea am: acba784cb4 am: e232b0fecc -s ours
...
am skip reason: Change-Id I623e0dcc1d3bc1a2a69a6cad34ace1f79532654e with SHA-1 f0b0eafabb
2020-01-17 22:04:35 +00:00
Automerger Merge Worker
4cdb1f9025
[automerger skipped] Move SystemUI to /system_ext am: e4ac0ac9ad am: fdce8b68a2 am: a8d34ba0c4 -s ours
...
am skip reason: Change-Id I54f86496d4a0045af3576091cce00e5cd285b4f8 with SHA-1 d45d9e111b
2020-01-17 22:04:28 +00:00
Automerger Merge Worker
d1bde22d89
[automerger skipped] move privapp_whitelist_com.android.storagemanager to system_ext am: 5d6fe03467 am: b72ac62f39 am: 6fb3cba2c4 -s ours
...
am skip reason: Change-Id Ie791b5fbe1b1906537a57e8f1c34029c0f092afc with SHA-1 f32bbcf742
2020-01-17 22:04:25 +00:00
Automerger Merge Worker
e174a0e3f8
[automerger skipped] Move 'privapp_whitelist_com.android.launcher3' to system_ext am: 25656d80e0 am: 029f9b2206 am: 6c61e199fb -s ours
...
am skip reason: Change-Id I5d11e3901633be82f375c56a5ef2c79b6e0b0922 with SHA-1 9a970c0494
2020-01-17 22:04:22 +00:00
Automerger Merge Worker
285f2a9d70
[automerger skipped] Move 'privapp_whitelist_com.android.settings' to system_ext am: 45e55d1892 am: d7a05da249 am: 6680093a52 -s ours
...
am skip reason: Change-Id I58ae29a6454f91f222b15ccbd9d3e5b5d5889289 with SHA-1 a8eb85afb4
2020-01-17 22:04:14 +00:00
Automerger Merge Worker
c7b75748fa
[automerger skipped] move privapp_whitelist_com.android.provision to system_ext am: 64bc816852 am: ee68caeccc am: d25caa5e2c -s ours
...
am skip reason: Change-Id I183397b6e7e3783e26f1fd345c357af47410bb22 with SHA-1 2c979fcb5f
2020-01-17 22:04:11 +00:00
Automerger Merge Worker
9f280c19b4
Merge "Annotate StringNetworkSpecifier @Deprecated and @removed" am: bd5a33f03b am: df2c3924ea
...
Change-Id: I6b999efcdf3c21325bdbd3a7b516bfbb9354a362
2020-01-17 22:04:08 +00:00
Automerger Merge Worker
2bb2265991
[automerger skipped] privapp_whitelist_com.android.emergency to system_ext am: b3d1dc096a am: d72050e289 am: 74bd22511e -s ours
...
am skip reason: Change-Id I50c04967fb5a3e4f3227b50d750f24d3d8deeec4 with SHA-1 38ed7d7410
2020-01-17 22:04:05 +00:00
Automerger Merge Worker
50c2bd51c3
[automerger skipped] privapp_whitelist_com.android.carrierconfig to system_ext am: 6350ba9b49 am: 396d84d8b8 am: ba242d08d1 -s ours
...
am skip reason: Change-Id I65cb7cb998d23541c8bcd2cfd81c8a9b94e7eccc with SHA-1 228ef6fa66
2020-01-17 22:03:59 +00:00
Automerger Merge Worker
43b4913836
Merge "Track addition of new java.util APIs." am: 00d0c52470 am: c050446807
...
Change-Id: I156c8298c6f1b1e044cc485f79909af088806e24
2020-01-17 22:03:33 +00:00
Automerger Merge Worker
f06eca1668
Merge "Tweak compat change override policy" am: 880792723a am: 3388e4181f
...
Change-Id: I55462975499d59a6e4a1686e85c11d0294d46f89
2020-01-17 22:03:15 +00:00
Automerger Merge Worker
5ae9d7e22e
Merge "Merge "Update API surface for ICU 66.0.1" am: d092e7cb86" into stage-aosp-master am: 36a5bd83f1 am: edde27aa7e
...
Change-Id: I0c566d34f1f610dffce1755f1863657c49d00c7b
2020-01-17 22:03:05 +00:00
Automerger Merge Worker
b2ec7a0374
[automerger skipped] Merge "Merge changes from topic "apps_to_system_ext" am: 046d939399" into stage-aosp-master am: 07435d063d -s ours
...
am skip reason: Change-Id I0662674a66bc54ee4713e5c7ed6ad0db4d342338 with SHA-1 2f4deb666e
2020-01-17 22:02:45 +00:00
Automerger Merge Worker
0e186edfbb
Merge "Merge "Expose ImsFeature#getFeatureState as @SystemApi" am: 40cae1c0c9" into stage-aosp-master am: 85bf0f73d0 am: 4a87dead9a
...
Change-Id: I4d39bae1e0eddd524a4088ecb7e0a22aca5ecfba
2020-01-17 22:02:35 +00:00
Automerger Merge Worker
42be1368dc
Merge "Update API surface for ICU 66.0.1" am: d092e7cb86 am: b453b3dea9 am: b273c4a17c
...
Change-Id: I8f8baadb668b410434f8b0fad0c5ea456b12659c
2020-01-17 22:01:05 +00:00
Automerger Merge Worker
c3e5f36b7e
Merge "Merge "add java_api_finder plugin to tethering module" am: 05c43b7095" into stage-aosp-master am: 6de4ca758f am: 5f906fa5b3
...
Change-Id: Ib87a0d8a02f8fb879b3c8e847e9367d09111afe1
2020-01-17 22:00:29 +00:00
Automerger Merge Worker
4614b5ab3f
[automerger skipped] Merge changes from topic "apps_to_system_ext" am: 046d939399 am: b09797a099 -s ours
...
am skip reason: Change-Id I0662674a66bc54ee4713e5c7ed6ad0db4d342338 with SHA-1 2f4deb666e
2020-01-17 21:59:59 +00:00
Automerger Merge Worker
cbe20fe9e6
Merge "Expose ImsFeature#getFeatureState as @SystemApi" am: 40cae1c0c9 am: 9ffe0e8fd6 am: 6eeecb51a4
...
Change-Id: I7fc2edacc7c9080561b4ece8c4092b741a1b4695
2020-01-17 21:59:58 +00:00
Automerger Merge Worker
68a1dfe382
Merge "add java_api_finder plugin to tethering module" am: 05c43b7095 am: 1d97c995f2 am: a277a46187
...
Change-Id: Ic00cb4f98e0d74d224de001f436928c8032f920b
2020-01-17 21:59:08 +00:00
Automerger Merge Worker
e6f0fa0b63
Merge "Implement the ThreadPrioritySetter interface" am: 28aec752bd am: dc2aaef2e6
...
Change-Id: Id54c89bfbbaf13a920a5e8ca4bb7027162e3891e
2020-01-17 21:58:26 +00:00
Automerger Merge Worker
8ebcb49a0b
[automerger skipped] Merge "Vibrator: Have Always-On Check DND/LowPower Modes" am: 301beddcdb am: f184b6b8d6 am: 722ee27372 -s ours
...
am skip reason: Change-Id I201f04ef1c2bdf7f10961e8c3d9b47cb7a815f11 with SHA-1 b701ad5825
2020-01-17 21:58:25 +00:00
Automerger Merge Worker
f1bc71b61e
[automerger skipped] Merge "Add NR to ServiceState#isLte and rename to isPsOnlyTech" am: ad189b5e60 am: 400ee161ad am: 5972b964e9 -s ours
...
am skip reason: Change-Id Id058d90bc6c4f35c85bc719740bee41865390eb7 with SHA-1 96169ca5ff
2020-01-17 21:58:11 +00:00
Automerger Merge Worker
d3cbf5673a
[automerger skipped] Merge "[Telephony Mainline] Removed IPackageManager reference" am: b114707641 am: 663cc563a4 am: 44dbd82667 -s ours
...
am skip reason: Change-Id I53d7d98b9689c1b4f764c24fc17bb488adcf96b5 with SHA-1 e8a2a8439e
2020-01-17 21:57:17 +00:00
Automerger Merge Worker
b19ac730a9
Merge "Exposing NetworkRegistrationInfo for PS service" am: 3ae8d12fe6 am: 4e34673c9a am: dbb66deae3
...
Change-Id: Id16673fea38c05bfa93d6a0459a5ae383ca0a04d
2020-01-17 21:56:50 +00:00
Automerger Merge Worker
d1bec4f465
Merge "Merge "Add mTimeStamp to SignalStrength" am: aa5b09f6ad" into stage-aosp-master am: 324ee26278 am: ed241470c6
...
Change-Id: I9de5a36c7928d0615cb620ef1a7a8f054dde9f98
2020-01-17 21:56:08 +00:00
Sudheer Shanka
9ab5352409
Merge "Add BlobStoreManager APIs."
2020-01-17 21:53:37 +00:00
