Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
662,205 Commits 3 Branches 0 Tags
56cc4a092d626d8acebf6781e643df966fa2fdfc
Commit Graph

662205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
56cc4a092d Merge "Add necessary parcelables of metadata" am: 8ed7defe20 am: 5c6ca53a00 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936186

Change-Id: I7e4c2d105ca8876e47162f1d1629c0b16937621b
 2022-01-07 15:55:01 +00:00
Treehugger Robot
cb6617a563 Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 am: bc8cdbeecb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: I561e94026c5ab362638a1e1e387ca9e02afdeb13
 2022-01-07 15:53:51 +00:00
TreeHugger Robot
d31bba2d5c Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into stage-aosp-master am: 105f98c38c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576463

Change-Id: I2539ffd6d175a1cda9100055f37a4b92184c6a83
 2022-01-07 14:05:53 +00:00
Treehugger Robot
5c6ca53a00 Merge "Add necessary parcelables of metadata" am: 8ed7defe20 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936186

Change-Id: I145c9b1dcf79b88f8e6508ef52830f22c919d4bf
 2022-01-07 13:26:34 +00:00
Treehugger Robot
8ed7defe20 Merge "Add necessary parcelables of metadata" 2022-01-07 13:07:11 +00:00
Treehugger Robot
bc8cdbeecb Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: Ie15d4d9d2e8239f89d0561dd22863726d732ab3c
 2022-01-07 12:30:46 +00:00
Treehugger Robot
81589202e5 Merge "[MS22] Move NetworkManagementSocketTagger into the module" 2022-01-07 12:07:53 +00:00
TreeHugger Robot
105f98c38c Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into stage-aosp-master 2022-01-07 12:00:48 +00:00
Junyu Lai
b7d0199763 [MS22] Move NetworkManagementSocketTagger into the module 
This is heavily used by TrafficStats, and no other modules
are using it. Hence it should be moved to the module as well.

Test: TH
Bug: 204830222

Change-Id: I7ea1ccb916e796c786c29d53e4ecf3970a8af6dd
 2022-01-07 09:57:15 +00:00
Bill Yi
4dd84bbe11 [automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 99d8d1fd2b -s ours 
am skip reason: Merged-In I4c199ec81b3f30a3a12ae40af29185549387d34d with SHA-1 9be07bf54c is already in history

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

Change-Id: I128f5ed6c1bad350ea449bba5da21123de3ea31b
 2022-01-07 02:01:46 +00:00
Bill Yi
99d8d1fd2b Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2022-01-07 01:41:28 +00:00
Meng Wang
e32ed4893f Merge changes from topic "phonenumber" am: 886bf03a2d am: e88de1e6df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921061

Change-Id: I8c487d6e8ee925672c422162b402c0f3343bf360
 2022-01-07 01:06:59 +00:00
Meng Wang
9c95c6e001 Deprecate get/setLine1Number in favor of get/setPhoneNumber am: 3e436616c6 am: 9fb15e5b46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920743

Change-Id: I79d6208a93a9449a60d0149e5488dcb1633afb0d
 2022-01-07 01:06:58 +00:00
Meng Wang
e88de1e6df Merge changes from topic "phonenumber" am: 886bf03a2d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921061

Change-Id: I90ca5ccbf686a975f479c2488ff34f82af12946a
 2022-01-07 00:46:54 +00:00
Meng Wang
9fb15e5b46 Deprecate get/setLine1Number in favor of get/setPhoneNumber am: 3e436616c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920743

Change-Id: Id7ad3d155ef1164c0b86e3ebf579e2faf512b1af
 2022-01-07 00:46:51 +00:00
Meng Wang
886bf03a2d Merge changes from topic "phonenumber" 
* changes:
  Update javadocs based on API council feedback.
  Deprecate get/setLine1Number in favor of get/setPhoneNumber
 2022-01-07 00:31:23 +00:00
Treehugger Robot
94a531c7fa Merge "Bluetooth: add LE Audio COD constant definition" am: d35cd459d6 am: c252a62ded 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1937497

Change-Id: I77cf59044f24b81c950e3884549dad17ef522361
 2022-01-07 00:24:01 +00:00
Treehugger Robot
c252a62ded Merge "Bluetooth: add LE Audio COD constant definition" am: d35cd459d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1937497

Change-Id: Ie934eb7ea8e83e7ecaf99f6cc496a455fd1fcd46
 2022-01-07 00:03:00 +00:00
Treehugger Robot
d35cd459d6 Merge "Bluetooth: add LE Audio COD constant definition" 2022-01-06 23:47:54 +00:00
Qasim Javed
6b795762eb Merge "Add BluetoothLeBroadcastAssistantCallback." am: bfad455280 am: d89e584952 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921059

Change-Id: Icf97f379b9d6540f3ff6c68e7a0ccb4f4dcace66
 2022-01-06 23:38:22 +00:00
Qasim Javed
d89e584952 Merge "Add BluetoothLeBroadcastAssistantCallback." am: bfad455280 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921059

Change-Id: Id59f4ca8952ad7a9376117762397ec395c3178e3
 2022-01-06 23:23:11 +00:00
Qasim Javed
bfad455280 Merge "Add BluetoothLeBroadcastAssistantCallback." 2022-01-06 23:00:35 +00:00
Grace Jia
93e2d21187 Merge "Add new API for new feature of display name." am: e43f70afc7 am: bacd6a4a11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807961

Change-Id: I83d94ad77c85887fdc7a1bf2a3401069ccd9bd94
 2022-01-06 19:38:13 +00:00
Grace Jia
bacd6a4a11 Merge "Add new API for new feature of display name." am: e43f70afc7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807961

Change-Id: I13c3cc86d2da47dff2fdd1f8caeec177eca1f1a0
 2022-01-06 19:18:19 +00:00
Grace Jia
e43f70afc7 Merge "Add new API for new feature of display name." 2022-01-06 18:59:37 +00:00
Qasim Javed
0809c7789f Add BluetoothLeBroadcastAssistantCallback. 
Bug: 205174140
Bug: 208222452
Tag: #feature
Test: gd/cert/run

Change-Id: I302f2d22e6f295db27c4309b7a30dd867a264439
 2022-01-06 18:39:53 +00:00
Artur Satayev
2a1baa94d8 Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java 
Merged-In: Iabd1ee367d8234425c5770455a20a413cc37c6a7
Change-Id: Iabd1ee367d8234425c5770455a20a413cc37c6a7
 2022-01-06 15:23:42 +00:00
Junyu Lai
4671dcf390 Merge "[MS32.1] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: ac674f3b41 am: 335b150723 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1935965

Change-Id: I79398aac9ad062213588cc40b64b933cfca96874
 2022-01-06 14:09:50 +00:00
Junyu Lai
d312550ff8 Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3cc8 am: 08c51b04ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914533

Change-Id: I244779c19fab00eede1b7e9f3980679131e75cbb
 2022-01-06 14:09:31 +00:00
Treehugger Robot
bbc431f3ea Merge "Remove ParcelFileDescriptor hidden API usage from IpSecService" am: ff35093684 am: 04e2efc144 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931585

Change-Id: Iaa93cb960dd369eeb1ad4b56ad49934d798ea2cf
 2022-01-06 14:09:00 +00:00
Junyu Lai
335b150723 Merge "[MS32.1] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: ac674f3b41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1935965

Change-Id: I0cb29b5c09e194e7b7e63ff0d6d0e30c6e95e779
 2022-01-06 14:04:04 +00:00
Junyu Lai
08c51b04ca Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3cc8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914533

Change-Id: I719edc4e4f98b0fdabb50736156551d3f8d35bd1
 2022-01-06 14:02:58 +00:00
Junyu Lai
ac674f3b41 Merge "[MS32.1] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" 2022-01-06 13:57:12 +00:00
Junyu Lai
beb9fb3cc8 Merge changes from topics "ms34-tm", "ms40-clock" 
* changes:
  [MS09] Expose NetworkTemplate APIs which are needed by NetworkPolicy
  [MS34.1] Replace TelephonyManager#getSubscriberId(subId) with public API
  [MS40.1] Remove Clock dependencies from NetworkStatsService
  [MS27] Expose noteUntaggedSocket SystemApi
 2022-01-06 13:56:39 +00:00
Treehugger Robot
04e2efc144 Merge "Remove ParcelFileDescriptor hidden API usage from IpSecService" am: ff35093684 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931585

Change-Id: I101f2650ce56c29223b2daf3c35e364a03b6fa2a
 2022-01-06 13:53:41 +00:00
Treehugger Robot
ff35093684 Merge "Remove ParcelFileDescriptor hidden API usage from IpSecService" 2022-01-06 13:40:26 +00:00
Treehugger Robot
e744aef437 Merge "Explicit cast from android::Base::Errno to status_t" am: 61ca5d7c56 am: b09f0dd179 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926909

Change-Id: I276ecc657f23047988e1f2280b3281947dfe1d05
 2022-01-06 11:46:09 +00:00
Treehugger Robot
b09f0dd179 Merge "Explicit cast from android::Base::Errno to status_t" am: 61ca5d7c56 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926909

Change-Id: Ie88997b696952726602513249d487510632331de
 2022-01-06 11:28:19 +00:00
Aaron Huang
4a6276d0dc Remove ParcelFileDescriptor hidden API usage from IpSecService 
IpSec service is going to be a part of Connectivity mainline module
and ParcelFileDescriptor(FileDescriptor) is a hidden API that cannot
be used by mainline module.

Therefore, use ParcelFileDescriptor.dup(FileDescriptor) to get a
ParcelFileDescriptor instead.

Bug: 204153604
Test: FrameworksNetTests
Change-Id: I0ccabdfc5060f4b635e9a7009a67fbd5d32002fd
 2022-01-06 19:16:43 +08:00
Treehugger Robot
a16f4ac7c3 Merge "Add BluetoothLeBroadcastSourceInfo." am: e5fb36cbf2 am: 7d24df44bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1915000

Change-Id: I52b2fdf4dbf9f812958e50151665c60189780e87
 2022-01-06 11:13:40 +00:00
Treehugger Robot
61ca5d7c56 Merge "Explicit cast from android::Base::Errno to status_t" 2022-01-06 11:11:17 +00:00
Treehugger Robot
7d24df44bc Merge "Add BluetoothLeBroadcastSourceInfo." am: e5fb36cbf2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1915000

Change-Id: Ic0a100a3162244ceaa0cbddb203e3c526e68d76d
 2022-01-06 10:55:29 +00:00
Treehugger Robot
e5fb36cbf2 Merge "Add BluetoothLeBroadcastSourceInfo." 2022-01-06 10:32:39 +00:00
Junyu Lai
d8684a2fa9 [MS32.1] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage 
Replace intent receiver with callback listener.

Test: atest com.android.server.net.NetworkStatsServiceTest
Bug: 204830222
Change-Id: I585b2bb471b59cbca3cce1c01ce527dff87f42da
 2022-01-06 09:22:53 +00:00
Junyu Lai
64c6943777 [MS09] Expose NetworkTemplate APIs which are needed by NetworkPolicy 
This change also remove getWifiNetworkKey which should not be exposed
as system API.

Test: atest NetworkTemplateTest
Bug: 204830222
Change-Id: I924f62025a8672167f778ff790cd208c74eed878
 2022-01-06 09:22:52 +00:00
Junyu Lai
27c9adb058 [MS34.1] Replace TelephonyManager#getSubscriberId(subId) with public API 
Test: atest com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Bug: 204830222
Change-Id: I57aa4470aea1715217fa7d74f2c9067b096d1bae
 2022-01-06 09:22:52 +00:00
Junyu Lai
2aa7b9ec4d [MS40.1] Remove Clock dependencies from NetworkStatsService 
This includes:
1. Re-implement the BestClock in the static library.
2. Expose SystemClock#currentNetworkTimeClock as public Api

Test: TH
Bug: 204830222
CTS-Coverage-Bug: 213393821
Exempt-From-Owner-Approval: 1. Owner approved the change with
  explicitly granted submission after adderessing the
  straight-forward comment. 2. Owner is OOO for 3 months.
Change-Id: I08c0162a7101cc6184f3eca3d4a59211183fb843
 2022-01-06 08:49:59 +00:00
Junyu Lai
0cf9e87c79 [MS27] Expose noteUntaggedSocket SystemApi 
While Data usage related codes are moving to mainline module,
StrictMode#vmUntaggedSocketEnabled() and onUntaggedSocket()
can no longer be accessed from NetworkManagementSocketTagger.

Thus, expose alternative SystemApi to allow invocations from
the module.

Test: TH
Bug: 204830222
Exempt-From-Owner-Approval: 1. Owner approved the change with
  explicitly granted submission after adderessing the
  straight-forward comment. 2. Owner is OOO for 3 months.
Change-Id: Ib54ff54ce3617ae0d04080a1740e78b086bbb039
 2022-01-06 08:49:46 +00:00
Josh Wu
04a84760b2 Add necessary parcelables of metadata 
This change partial upstream necessary
a.m.audio.common.types for aosp/1936041.

Bug: 203490261
Test: m android.hardware.audio.common
Change-Id: Ice160b3eb642245daaa47394b156fd1ebafab82b
Merged-In: I3331d7e3d76db50f5b3c4db57891a20e4f935ad8
 2022-01-06 06:36:52 +00:00
Bill Yi
e515a3e90f Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE 
Merged-In: I4c199ec81b3f30a3a12ae40af29185549387d34d
Change-Id: Iaad5a0650e1a87995c1e15c9e53f3025cd157b90
 2022-01-05 21:10:48 -08:00