Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
529,227 Commits 3 Branches 0 Tags
1c8bae830128782bbd616a9475c452bbcfe4ccbf
Commit Graph

529227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Bright
1c8bae8301 Merge "Add HAL for pdu session id support" am: 9fece51be5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480315

Change-Id: I0cae4eba85d28edf5c35871e49633c92f4515396
 2020-11-02 23:53:32 +00:00
Daniel Bright
9fece51be5 Merge "Add HAL for pdu session id support" 2020-11-02 23:10:05 +00:00
Shuo Qian
053e5b3d7f Merge "Try to add AppOps Keys into Proto to unblock my project" am: 324ef4ff23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477127

Change-Id: I41d3f3483af865653e8feb8a29628a072bb43d16
 2020-11-02 22:39:53 +00:00
Treehugger Robot
38bf0c92d1 Merge changes from topic "setDataEnabled" am: b43f1dc00b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481057

Change-Id: I1310b91027a5842ce6cf854580ea39954b26acd8
 2020-11-02 22:27:52 +00:00
Sooraj Sasindran
007a98c58f Make sure to handle exceptions for setDataEnabled am: dfaf434b20 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358928

Change-Id: Ic3e13fa7a625533cb03454f13dafa75bff15e8e1
 2020-11-02 22:24:33 +00:00
Sooraj Sasindran
760d579771 Support api to control data by thermal service am: 70c1d66847 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481056

Change-Id: Ia36a897ffc6a33b966805e039e78569badb8c688
 2020-11-02 22:20:32 +00:00
Shuo Qian
324ef4ff23 Merge "Try to add AppOps Keys into Proto to unblock my project" 2020-11-02 21:43:07 +00:00
Treehugger Robot
b43f1dc00b Merge changes from topic "setDataEnabled" 
* changes:
  Rename setDataEnabledWithReason
  Make sure to handle exceptions for setDataEnabled
  Support api to control data by thermal service
 2020-11-02 21:32:21 +00:00
Janis Danisevskis
68acc834d4 Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470088

Change-Id: Ia71e6036162249dd05f16deffc29b0b8f75ceab7
 2020-11-02 20:38:08 +00:00
Janis Danisevskis
18bbac10c1 Merge changes I7c17ab51,I5bd4acb4,I93270f00 
* changes:
  Add KM_ERROR_HARDWARE_TYPE_UNAVAILABLE to KeymasterDefs
  Keystore SPI: Deprecate encryption flag.
  Keystore 2.0: Deprecate Credential prefixes.
 2020-11-02 19:45:51 +00:00
Treehugger Robot
10fec2b58f Merge "Fix VibratorService waveform accumulated delay" am: 02fe6c4bf8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471182

Change-Id: I96dcac8bc6d085ac830228fa0c64bb515201478f
 2020-11-02 17:00:26 +00:00
Treehugger Robot
02fe6c4bf8 Merge "Fix VibratorService waveform accumulated delay" 2020-11-02 16:21:57 +00:00
Andrei-Valentin Onea
1e91aa6b78 Merge "Migrate CTS_SYSTEM_API_CHANGEID to @EnabledSince" am: 9aed0ced55 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481310

Change-Id: I17a549fbef3c8402671db0e5bc374e20bd26c0b0
 2020-11-02 16:16:21 +00:00
Andrei-Valentin Onea
9aed0ced55 Merge "Migrate CTS_SYSTEM_API_CHANGEID to @EnabledSince" 2020-11-02 16:01:29 +00:00
Xiao Ma
e3fc8eed91 Merge "Apply more generic AIDL package name on jarjar rule." am: 3c3baf163a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479483

Change-Id: Icf0a5f320f8fe98b7d1b4a706428cdee3d5db6cd
 2020-11-02 02:13:01 +00:00
Xiao Ma
3c3baf163a Merge "Apply more generic AIDL package name on jarjar rule." 2020-11-02 02:02:46 +00:00
Sooraj Sasindran
64db0761f7 Rename setDataEnabledWithReason 
1. Rename setDataEnabledWithReason to
setDataEnabledForReasn

2. Allow isDataConnectionAllowed to be accessed by
same apps as isDataEnabledForReason

3. Make these apis public

Bug: 156332911
Test: cts and build
Change-Id: I8672ab8861fdec1854427ee9ce5ad8eec8774608
Merged-In: I8672ab8861fdec1854427ee9ce5ad8eec8774608
 2020-10-31 16:22:53 +00:00
Sooraj Sasindran
dfaf434b20 Make sure to handle exceptions for setDataEnabled 
Make sure to handle exceptions for setDataEnabledWithReason
and isDataEnabledWithReason when they are called within
existing APIs

Bug: 155765311
Test: build
Change-Id: If59deaca05b841c8c896c449445434b4181c9626
Merged-In: If59deaca05b841c8c896c449445434b4181c9626
 2020-10-31 16:22:42 +00:00
Sooraj Sasindran
70c1d66847 Support api to control data by thermal service 
Support api to control data by thermal service
Restructure data enablement API to have single API
with reason as an input to stop adding new apis
for new usecases.

Bug: 151342791
Test: added new CTS tests and verified

Change-Id: I763c422ba54907984977d19b2774c31337e5ffe5
Merged-In: I763c422ba54907984977d19b2774c31337e5ffe5
 2020-10-31 16:22:12 +00:00
Tobias Thierer
04af92eeba Merge "Backup platform: Update OWNERS." am: 0be136593e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479959

Change-Id: I8a155160e2c2bb7201db1021e0b5540380b470f3
 2020-10-31 01:40:09 +00:00
Tobias Thierer
0be136593e Merge "Backup platform: Update OWNERS." 2020-10-31 01:08:22 +00:00
Sudheer Shanka
cada17643d Merge "NPMS lock improvement." am: 053893568a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480258

Change-Id: I961b2ea8aead71b92241496fd24d12fc301b13bf
 2020-10-30 19:35:48 +00:00
Sudheer Shanka
053893568a Merge "NPMS lock improvement." 2020-10-30 18:40:01 +00:00
Andrei Onea
58d18786f5 Migrate CTS_SYSTEM_API_CHANGEID to @EnabledSince 
The actual target sdk for this changeid is currently irrelevant; it does
need to be larger than the target SDK of the CTS test app (to allow
opting in), and invisible in dev UI. The latter was already the case,
however made it explicit.

Bug: 149103556
Bug: 149469819
Test: adb shell dumpsys platform_compat | grep CTS_SYSTEM_API_CHANGEID
Change-Id: I64a10bb0964349eb212d26cf40e9f15ad2ba61da
 2020-10-30 17:59:32 +00:00
Emilian Peev
ce1dd0aafd Merge "Expose Image and Plane for testing" am: 56804f0560 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463664

Change-Id: Ic6ad221e6102a81333deb49b0ca33b3b9a4067a3
 2020-10-30 16:40:22 +00:00
Emilian Peev
56804f0560 Merge "Expose Image and Plane for testing" 2020-10-30 16:10:30 +00:00
Anton Hansson
d6987e84d5 Merge "Move non-updatable-api/ to core/api/" am: ad2bb796b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480537

Change-Id: I636de254b4d7dd9c8f7ffe4cb55a12ada1fcf53b
 2020-10-30 15:53:29 +00:00
Anton Hansson
ad2bb796b0 Merge "Move non-updatable-api/ to core/api/" 2020-10-30 15:22:45 +00:00
Treehugger Robot
0e2959a56b Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459882

Change-Id: I1a3b685f04d7b4d7d5a028015e94742c83db2dc8
 2020-10-30 10:37:17 +00:00
Treehugger Robot
a13966feea Merge "NetworkNotificationManager gets NotificationManager locally" 2020-10-30 10:21:29 +00:00
Treehugger Robot
b357c138f5 [automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours 
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history

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

Change-Id: I47de082b8e60278e8baa8381a384001d636e6f90
 2020-10-30 09:13:35 +00:00
Treehugger Robot
2635bb28b4 Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359902

Change-Id: I2815b83b72268d53b057f072d447b6688bb7d77e
 2020-10-30 09:10:59 +00:00
Anton Hansson
0a354a95f4 Merge "Remove the module-lib-api target" am: 36bd16e5ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480536

Change-Id: I62b2f05995db0f8413c0a79b09e489c61f0007a2
 2020-10-30 09:06:43 +00:00
Treehugger Robot
c8769826af Merge "Restructure Module code [ com.android.tethering ]" 2020-10-30 08:41:36 +00:00
Treehugger Robot
f86cf6fb6c Merge "cleanup the isUpdatedSystemApp" 2020-10-30 08:38:43 +00:00
Anton Hansson
36bd16e5ab Merge "Remove the module-lib-api target" 2020-10-30 08:25:39 +00:00
Yo Chiang
f785394fb3 Merge "Disable DSU in executeRebootToNormalCommand()" am: 0b6bf88ccd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470783

Change-Id: I4bb7d89b9e6074e53c99b8e3cc6cc167a6b10add
 2020-10-30 07:14:25 +00:00
Yo Chiang
0b6bf88ccd Merge "Disable DSU in executeRebootToNormalCommand()" 2020-10-30 06:55:43 +00:00
Sarah Chin
4f26bb37a1 Merge "Update NETWORK_TYPE_NR docs" am: a49fb9831e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480313

Change-Id: Ia1182d10a2d23a59cb3b576bccdb14860216f561
 2020-10-30 06:38:14 +00:00
Sarah Chin
a49fb9831e Merge "Update NETWORK_TYPE_NR docs" 2020-10-30 06:25:14 +00:00
Baligh Uddin
aaea97b6f3 Restructure Module code [ com.android.tethering ] 
Code Migration from frameworks/base/packages/Tethering ->
packages/modules/Connectivity/Tethering

BUG: 167962976
Test: m com.android.tethering + TH
Merged-In: Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7
Change-Id: Ifae56d991b43c02f1e3496abbafc87d1869add8a
 2020-10-30 05:44:59 +00:00
Daniel Bright
ae9daa85e0 Add HAL for pdu session id support 
* Add in HAL support for AOSP allocating pdu session ids from modem
* Add in HAL support that notifies modem when a handover has begun and was cannceled
(clean cherry pick)

Test: N/A
Bug: 161572859
Merged-In: I1637fe48c785eae28f04e55cdb6fcabd606d744f
Change-Id: I58f6803a7e3eeccd3077dca888e2a4021f47b57f
 2020-10-29 21:57:19 -07:00
Baligh Uddin
7ba7715c73 Merge "Restructure Module code [ com.android.tethering ]" into stage-aosp-master 2020-10-30 04:54:12 +00:00
Paul Hu
6ae7712499 Merge "Replace NotificationManager @hide APIs" am: ff4b8b180c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1452435

Change-Id: I58d1c42c112855e43df6d6af4cd6e10373cff2bb
 2020-10-30 04:00:36 +00:00
paulhu
8d9a5ebb61 NetworkNotificationManager gets NotificationManager locally 
It's confusing that NetworkNotificationManager uses
NotificationManager to put up notifcation which is passed from
ConnectivityService. And that NotificationManager should be
gotten from a context with UserHandle.ALL because the
notification should notify to all users. But the future developer
may not know this and pass incorrect NotificationManager
probably. Therefore, adjust the design that
NetworkNotificationManager will get NotificationManager locally.

Bug: 170593746
Test: atest FrameworksNetTests
Change-Id: Id65c998052b7b223171c5194ea46b49d7e84729d
 2020-10-30 03:37:50 +00:00
Paul Hu
ff4b8b180c Merge "Replace NotificationManager @hide APIs" 2020-10-30 03:36:40 +00:00
Hui Yu
1330f0236f NPMS lock improvement. 
Fix NPMS lock contention:
Between 'com.android.server.net.NetworkPolicyManagerService$NetworkPolicyManagerInternalImpl.isUidNetworkingBlocked(int, java.lang.String)' and 'com.android.server.net.NetworkPolicyManagerService$NetworkPolicyManagerInternalImpl.getSubscriptionPlan(android.net.NetworkTemplate) on lock mNetworkPoliciesSecondLock.

Bug: 162350812
Test: regresstion test.
Change-Id: Ibbb4325c7380a2febf3682b3ae3436647ae82e16
Merged-In: Ibbb4325c7380a2febf3682b3ae3436647ae82e16
 2020-10-30 03:24:22 +00:00
Sarah Chin
8787e9f3f0 Merge "Add local logs for TelephonyDisplayInfo changed" am: 02ae7ec0f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480311

Change-Id: I7a1dd3a6603944f677b07e78ebe34a9c4c3660e9
 2020-10-30 03:09:49 +00:00
Treehugger Robot
4d0e0a264b Merge "Introduce a BluetoothConnectionCallback that will fire off events when a device is connected or disconnected." am: 917b0a4488 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478819

Change-Id: I02e4dc3b8eb369728dea0ea61d20de8c1f33cbcb
 2020-10-30 03:00:49 +00:00
Xiao Ma
0319375174 Apply more generic AIDL package name on jarjar rule. 
Since we created a new package(android.net.networkstack.aidl)
particularly for new added stable AIDL files, using generic
wildcards instead of enumerating each specific parcelable name.

Bug: 157534516
Test: atest FrameworksNetTests
Change-Id: I83f7ef42d0af1d691abd4b5892b079d4ab17e6b4
 2020-10-30 02:51:23 +00:00