Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
563,864 Commits 3 Branches 0 Tags
f369634aae753ffc94e232dc8475d7e1499d5de8
Commit Graph

563864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
f369634aae Merge "Expose Build.VERSION.FIRST_SDK_INT as module-lib API" am: 64625e9706 am: 7126f9404b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8cb0ca497e0cbaea24d9e7c376f8f3f0ded69a2
 2021-01-22 12:39:19 +00:00
Paul Hu
7126f9404b Merge "Expose Build.VERSION.FIRST_SDK_INT as module-lib API" am: 64625e9706 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id59c389898994decfa905922c6c2a4d143348994
 2021-01-22 12:00:59 +00:00
Kohsuke Yatoh
b20ead33b9 Merge "Add services/core/j/c/a/server/security/OWNERS." am: 984e3764a5 am: b8de63657c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556757

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia10f8add870d3baca5319f6c4dc49e4149a735f4
 2021-01-22 12:00:45 +00:00
Paul Hu
64625e9706 Merge "Expose Build.VERSION.FIRST_SDK_INT as module-lib API" 2021-01-22 11:50:09 +00:00
Kohsuke Yatoh
b8de63657c Merge "Add services/core/j/c/a/server/security/OWNERS." am: 984e3764a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556757

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I500364497618f845cf74d555697d91c3c2a30efa
 2021-01-22 11:36:28 +00:00
Remi NGUYEN VAN
35c1ee2a54 Merge "Mark connectivity test utilities as module API" am: c74d6f3115 am: ea30ec0379 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10d521b26061821ab1ee57d1938416163d93de92
 2021-01-22 11:12:11 +00:00
Kohsuke Yatoh
984e3764a5 Merge "Add services/core/j/c/a/server/security/OWNERS." 2021-01-22 11:11:02 +00:00
Remi NGUYEN VAN
ea30ec0379 Merge "Mark connectivity test utilities as module API" am: c74d6f3115 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5973e19d7b7a103235121f5efc1951985e3a4c41
 2021-01-22 10:34:16 +00:00
Remi NGUYEN VAN
c74d6f3115 Merge "Mark connectivity test utilities as module API" 2021-01-22 10:11:39 +00:00
paulhu
69f79b0aca Expose Build.VERSION.FIRST_SDK_INT as module-lib API 
Connectivity service is going to become a mainline module which
will not be able to access hidden APIs. But PermissionMonitor
needs know Build.VERSION.FIRST_SDK_INT for granting network
restricted permission to system packages. Thus, expose the value
as module-lib API to support the usage.

Bug: 170598012
Test: make update-api
Change-Id: Id0ae42120f69faee43eeb7ebd35cae9e26cb7561
 2021-01-22 15:30:07 +08:00
Remi NGUYEN VAN
649e3a28dd Mark connectivity test utilities as module API 
The API surface is planned to move to the Connectivity module, meaning
that it will be maintained across multiple Android releases.
This is incompatible with TestApi semantics, which are designed to be
removable across releases. Effectively the APIs become SystemApi, so
mark them as such considering that TestApi is not supported by modules.

Remove the NetworkCapabilities.getCapabilities test API that is not
essential for tests, and mark other APIs as module API.

Test: m
Bug: 174436414
Change-Id: Ic04551a9874b3d756cf5e6c77ceabfc7c85d52a6
 2021-01-22 16:16:57 +09:00
TreeHugger Robot
5b85851286 [automerger skipped] Merge "Enabled TEMP_NOT_METERED support for carriers" into rvc-qpr-dev am: dba4775626 -s ours 
am skip reason: Change-Id Ie0323a354c89abf1a0effa0b65cde3b4d010115e with SHA-1 ea53b4ef65 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13369040

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56538712420f66b3535606f0124361ccb5ca32d9
 2021-01-22 05:38:18 +00:00
TreeHugger Robot
dba4775626 Merge "Enabled TEMP_NOT_METERED support for carriers" into rvc-qpr-dev 2021-01-22 05:05:38 +00:00
Jack Yu
c7396ea492 Merge "Add intent to notify applications when the secure element state changed" am: 286dc55bc9 am: 27a214dabd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cded08c01c754a8ef4b80ca8f0f2bda21c68e48
 2021-01-22 04:42:49 +00:00
Jack Yu
27a214dabd Merge "Add intent to notify applications when the secure element state changed" am: 286dc55bc9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fad1ea62a98ecc8c44375de5d0a9b6d1d356d50
 2021-01-22 04:12:34 +00:00
Paul Hu
796c878352 Merge "Expose Context#sendStickyBroadcast(Intent, Bundle)" am: 846e5f178d am: c9e394fc27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1491876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic690e30e491538bef18fc4ca8b480609fd953d65
 2021-01-22 03:03:01 +00:00
Jack Yu
286dc55bc9 Merge "Add intent to notify applications when the secure element state changed" 2021-01-22 02:58:28 +00:00
Paul Hu
c9e394fc27 Merge "Expose Context#sendStickyBroadcast(Intent, Bundle)" am: 846e5f178d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1491876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6850fa846a8be585e892538dbc542971009d9e1b
 2021-01-22 02:49:14 +00:00
Yu-Han Yang
b598f1ad3d [automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: 579b74d5cb -s ours am: 5f1b131c67 am: 95ff5252f2 -s ours am: 4fa14bd295 am: ce7284568f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13356152

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2f835dad1750d3d5a89f56c9a97df474b7e22e8
 2021-01-22 02:39:49 +00:00
Keun-young Park
8bc0064dca Merge "add Shell-package-library to allow product type level update" into rvc-qpr-dev am: 0ade1ea0eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13383403

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42995f9c504fb34480fc3ba199ca431ee76a486a
 2021-01-22 02:39:25 +00:00
Keun-young Park
81eee38e4b Merge "Change target package for com.android.car.shell" into rvc-qpr-dev am: 24a5429296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13383398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc629d9ec7c9ee678a164199c8499534bbf60450
 2021-01-22 02:39:13 +00:00
Paul Hu
846e5f178d Merge "Expose Context#sendStickyBroadcast(Intent, Bundle)" 2021-01-22 02:11:13 +00:00
Yu-Han Yang
ce7284568f [automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: 579b74d5cb -s ours am: 5f1b131c67 am: 95ff5252f2 -s ours am: 4fa14bd295 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13356152

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28516cee1126e2e73d8de806b7c53354c3783428
 2021-01-22 02:09:51 +00:00
Keun-young Park
0ade1ea0eb Merge "add Shell-package-library to allow product type level update" into rvc-qpr-dev 2021-01-22 01:56:41 +00:00
Keun-young Park
24a5429296 Merge "Change target package for com.android.car.shell" into rvc-qpr-dev 2021-01-22 01:56:41 +00:00
Louis Chang
7896757e9b Merge "Do not attach the added recent task to TDA" am: 6004efd8ee am: a10f155b20 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554021

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1661a4360f1dacfee8006b8d21963eab5f0a2c5d
 2021-01-22 01:48:27 +00:00
Remi NGUYEN VAN
c408b6f4b3 Merge "Use network list in UNDERLYING_NETWORKS_CHANGED" am: a6f4de3432 am: 04b88cae4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1458448db36acce05cad6ba9f41b4d7d11bc684a
 2021-01-22 01:47:51 +00:00
Yu-Han Yang
4fa14bd295 [automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: 579b74d5cb -s ours am: 5f1b131c67 am: 95ff5252f2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13356152

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbd9c4992dcc36bcaa2cd7533c161bb727d7e9cd
 2021-01-22 01:38:03 +00:00
Louis Chang
a10f155b20 Merge "Do not attach the added recent task to TDA" am: 6004efd8ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554021

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife64a79f0fd2077fdd98e7504ad985fc67761f36
 2021-01-22 01:28:01 +00:00
Louis Chang
6004efd8ee Merge "Do not attach the added recent task to TDA" 2021-01-22 01:24:18 +00:00
Remi NGUYEN VAN
04b88cae4f Merge "Use network list in UNDERLYING_NETWORKS_CHANGED" am: a6f4de3432 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58184fe4f731319b7bf4c8cf24c0a6571e4a1d8b
 2021-01-22 01:22:25 +00:00
Yu-Han Yang
95ff5252f2 [automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: 579b74d5cb -s ours am: 5f1b131c67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13356152

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I528216f95304feb46f2347f88c8d8022f1304b12
 2021-01-22 01:21:05 +00:00
Yu-Han Yang
5f1b131c67 [automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: 579b74d5cb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13356152

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15ef669c829151863c72c1bba15380429fb768e5
 2021-01-22 01:06:20 +00:00
Remi NGUYEN VAN
a6f4de3432 Merge "Use network list in UNDERLYING_NETWORKS_CHANGED" 2021-01-22 01:06:01 +00:00
Yu-Han Yang
579b74d5cb DO NOT MERGE: Do not inject mock location to chipset 
Bug: 177561690
Test: on device
Change-Id: Icafbdf54fe807f8779377b13cb4e4eb265db692e
 2021-01-21 16:40:13 -08:00
Tianjie Xu
3720d381a9 Merge "Check slot in reboot function" am: 70127316bf am: 4635bad13b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504110

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8185a0947f715091f3190a016d5ed126dbb49fff
 2021-01-21 23:54:01 +00:00
Yu-Han Yang
557954f553 [automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6 am: 77fa00f38f -s ours am: 691ae7772d am: 3e7e30265b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4faf0e64d3fd57823b6472ee52ca3b8fa2946c1
 2021-01-21 23:53:04 +00:00
Sarah Chin
871566afab Merge "Update TelephonyDisplayInfo docs" am: a906fd5e14 am: 90b6c9def0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e12f5e374fd29601182e8b99250a91933a2556
 2021-01-21 23:34:25 +00:00
Yu-Han Yang
3e7e30265b [automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6 am: 77fa00f38f -s ours am: 691ae7772d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I204a77fcaa890c1bbf86f6eef05f875b7a114831
 2021-01-21 23:34:12 +00:00
Tianjie Xu
4635bad13b Merge "Check slot in reboot function" am: 70127316bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504110

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89c908bb931c25521b9c7bd8faf4d57c31882143
 2021-01-21 23:29:32 +00:00
Yu-Han Yang
691ae7772d [automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6 am: 77fa00f38f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie57557ba29ac8a8ca7827ed039817b6c75c1b0d6
 2021-01-21 23:21:39 +00:00
Tianjie Xu
70127316bf Merge "Check slot in reboot function" 2021-01-21 23:18:55 +00:00
Sarah Chin
90b6c9def0 Merge "Update TelephonyDisplayInfo docs" am: a906fd5e14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa3747cf505974fa1faea05589b981fd687d0109
 2021-01-21 23:10:20 +00:00
Yu-Han Yang
faec4dfefd DO NOT MERGE: Do not inject mock location to chipset am: e8212659b9 am: 9c2a7887f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358221

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e6828c71c216c14e95dc7ab921ec84c70779d36
 2021-01-21 23:09:20 +00:00
Automerger Merge Worker
935f1287e8 Merge "Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: 821bc3759c" into rvc-qpr-dev-plus-aosp 2021-01-21 23:09:17 +00:00
Jeff Sharkey
0cfbc863f7 Merge "Update AppWidget owners" am: 8c9bf65b8b am: ea29396752 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556378

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I742b341c6d3c6a5ca7912c59e0c5cebfb279791f
 2021-01-21 23:09:09 +00:00
Marco Ballesio
aa838b8c30 Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: 821bc3759c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13385165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fdd76e3579e47ea62ef133e3934fd7277883a6f
 2021-01-21 23:09:08 +00:00
Alisher Alikhodjaev
e11bf049a9 Merge "Correct OMAPI OWNERS" am: 2046b3f187 am: 7d825375a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552054

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide1c94afe872365d69f34bd62200e6990b10c585
 2021-01-21 23:08:57 +00:00
Automerger Merge Worker
b8349d34c2 Merge changes from topic "am-9f1f3a1f2cf946f0b2fe74dbf8e9b4d1" into rvc-qpr-dev-plus-aosp 
* changes:
  Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830cb8
  DO NOT MERGE: Do not inject mock location to chipset am: abccd8f7bc
 2021-01-21 23:08:41 +00:00
TreeHugger Robot
7a606738dc Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830cb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370369

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf337d347c30f5b34bac2fe86fd55a142d2a3647
 2021-01-21 23:08:26 +00:00