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

563889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Corkery
f85308beef Merge "Remove dumpstate error race condition" am: 5c67510b4f am: 8f01336f0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I221ac8d6327121805d2309234d12286dda6f9858
 2021-01-22 17:16:44 +00:00
vichang
e10a7b9910 Merge changes from topic "icu68" am: e17a139088 am: 714b3ec814 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie97caf105d4a1c2ea8da991376f10545daab34d1
 2021-01-22 16:28:20 +00:00
Gavin Corkery
8f01336f0d Merge "Remove dumpstate error race condition" am: 5c67510b4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice28160099c9b46baeff8cac76137e6b81b76a67
 2021-01-22 16:27:56 +00:00
Gavin Corkery
5c67510b4f Merge "Remove dumpstate error race condition" 2021-01-22 16:14:43 +00:00
vichang
714b3ec814 Merge changes from topic "icu68" am: e17a139088 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05eb8faef4d6fcf7283b01614c97f9ef2e74d0ea
 2021-01-22 15:55:13 +00:00
vichang
e17a139088 Merge changes from topic "icu68" 
* changes:
  Update test expectation due to locale data change in ICU 68.2
  Regenerate LocaleDataTables.cpp due to ICU 68 upgrade
 2021-01-22 15:24:51 +00:00
rickywai
2830048b80 Merge "Return error in "sm unmount-app-data-dirs" if app data isolation is not enabled" am: 4d53e3b9bc am: 361fd37803 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556237

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8deb160530205a3ac3a390ec87a8cc58ceb2b16e
 2021-01-22 15:22:09 +00:00
Paul Hu
57f66184e3 Merge "Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks()" am: ce1b5d00d9 am: e8a98db615 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53d02efcb85b72671dcd89acf917518a53049b11
 2021-01-22 15:21:54 +00:00
rickywai
361fd37803 Merge "Return error in "sm unmount-app-data-dirs" if app data isolation is not enabled" am: 4d53e3b9bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556237

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If03f03feb9f89a15fa5ca0e6145fbe87a5a150a1
 2021-01-22 14:56:57 +00:00
Paul Hu
e8a98db615 Merge "Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks()" am: ce1b5d00d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f8833a502cfa4674190509300eb378c4072efcc
 2021-01-22 14:53:33 +00:00
rickywai
4d53e3b9bc Merge "Return error in "sm unmount-app-data-dirs" if app data isolation is not enabled" 2021-01-22 14:19:52 +00:00
Paul Hu
ce1b5d00d9 Merge "Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks()" 2021-01-22 14:18:47 +00:00
Chalard Jean
cc08384548 Merge "Add Qos Callback support" am: 8e39c04b56 am: d52695827d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386623

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d07d8e5bd5e0a40df7d7fa276bf0c1fed500ed1
 2021-01-22 14:17:50 +00:00
Chalard Jean
d33e21d07e Merge "Add Qos Callback files" am: d346446302 am: 82009d6957 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557008

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1000035eb541c666d193a36647e7070647d3248a
 2021-01-22 14:17:18 +00:00
Chalard Jean
d52695827d Merge "Add Qos Callback support" am: 8e39c04b56 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386623

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73984d62a914a4d96ed116c3c25ebdce7e6426ea
 2021-01-22 13:41:39 +00:00
Chalard Jean
82009d6957 Merge "Add Qos Callback files" am: d346446302 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557008

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63e1639172bde1ffd498605b9d1a43633cc8a623
 2021-01-22 13:31:16 +00:00
Gavin Corkery
faf53d2a76 Remove dumpstate error race condition 
Removes the race condition between the dumpstate binder service
death recipient and the dumpstate listener error callback. This
is done by adding a small wait when the death recipient is
invoked. This ensures that the caller of the Bugreport API does
not erroneously receive an incorrect runtime error callback.

Alters internal tests to account for this new delay.

Bug: 147703592
Test: atest BugreportManagerTest
Test: Manual. Take bugreport, ensure that the death recipient
      does not send an error callback when dumpstate finishes
      successfully, or fails and exits. Test error case by
      manually invoking signalErrorAndExit in DumpstateService.
Change-Id: I8c5b14c88502f0cf4f4f0e5c41d90d6065bfd1d4
 2021-01-22 13:31:14 +00:00
Chalard Jean
8e39c04b56 Merge "Add Qos Callback support" 2021-01-22 13:09:24 +00:00
Chalard Jean
d346446302 Merge "Add Qos Callback files" 2021-01-22 13:06:43 +00:00
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
Victor Chang
68a592163b Update test expectation due to locale data change in ICU 68.2 
Bug: 160356314
Test: atest FrameworksCoreTests:android.text.format
Change-Id: I1c98de411794b9a964236a3bd128e8aaad52da97
 2021-01-22 11:29:41 +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
Ricky Wai
2007b0564e Return error in "sm unmount-app-data-dirs" if app data isolation is not enabled 
This command should not do anything when feature flag is off,
and let developer knows this command fails.

Bug: 177228735
Test: run "sm unmount-app-data-dirs" when the app data isolation flag is off and returns error message
Change-Id: If07107712e8215a58ffade08aedce3e80ad1ac12
 2021-01-22 10:15:01 +00:00
Remi NGUYEN VAN
c74d6f3115 Merge "Mark connectivity test utilities as module API" 2021-01-22 10:11:39 +00:00
paulhu
f0b4cd7fed Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks() 
Connectivity service is going to become a mainline module which
will not able to access hidden APIs. NetworkPolicyManagerInternal
is a internal serivce that CS can't be access after be a mainline
module. Thus, create NPMS#isUidRestrictedOnMeteredNetworks() and
NPM#isUidRestrictedOnMeteredNetworks() to replace
NPMI#isUidRestrictedOnMeteredNetworks().

Also correct the permission check in isUidNetworkingBlocked()
that needs to check OBSERVE_NETWORK_POLICY only.

Bug: 170598012
Test: atest FrameworksNetTests
Test: atest FrameworksCoreTests:NetworkPolicyManagerTest
Test: atest FrameworksServicesTests:NetworkPolicyManagerServiceTest
Test: atest CtsNetTestCases
Test: atest CtsHostsideNetworkTests
Change-Id: I5801a3a2076f3eb199a0226c38c85014b26c64e7
 2021-01-22 16:14:28 +08: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
Daniel Bright
2cc8ead3d6 Add Qos Callback support 
* Provide App Developers Qos related info associated to
  a bound socket through ConnectivityManager
* Qos sessions are generated and filtered by Network Agents
  and sent back through the Connectivity Service to the
  API consumer.
* The structure of the code within com.android.server
  is designed to support different types of filters in the
  the future.
* The first type of Qos Attributes are related to EPS
  Bearers in order support RCS.

Bug: 155176305
Test: Added to cts/NetworkAgentTest
Test: Added to ConnectivityServiceTest
Change-Id: I145dd065d9deeee449eb9695ab3f6c8556ee7c09
 2021-01-21 20:14:52 -08: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
Daniel Bright
289920808b Add Qos Callback files 
* Add QosCallback stub files

Bug: 155176305
Test: N/A
Change-Id: I7c231d60880c37ae1ce49fa8a621badf386ab8a7
 2021-01-21 19:50:24 -08: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