Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
684,035 Commits 3 Branches 0 Tags
175aa192cf20829b6797fc20f47d462e2eaba68d
Commit Graph

9729 Commits

Author SHA1 Message Date
Dmitri Plotnikov
d012a49df3 Merge "Include saved battery history chunks into BatteryUsageStats parcel" am: 2f7508a404 am: 587f8cec3d am: 4c21515da7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928178

Change-Id: I283453f3391287e7c2d672db178acbdd57fe715f
 2022-01-22 07:10:25 +00:00
Dmitri Plotnikov
4c21515da7 Merge "Include saved battery history chunks into BatteryUsageStats parcel" am: 2f7508a404 am: 587f8cec3d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928178

Change-Id: I3f3d98d9e44f2807c5558127f84838f40c612297
 2022-01-22 06:52:51 +00:00
Dmitri Plotnikov
c4b9de7d95 Include saved battery history chunks into BatteryUsageStats parcel 
Bug: 209297031
Test: Test: atest FrameworksCoreTests:BatteryUsageStatsTest FrameworksCoreTests:BatteryUsageStatsProviderTest
Merged-In: I369d863b6f6fd488030aa031cc465bef6ce99ab8
Change-Id: Ifc70a49b731b5510e7bcd049e0c12d9ac7f68f44
 2022-01-21 22:44:46 +00:00
Hao Ke
70398d2001 Merge "Changing readParcelable and readSerializable's method signatures." am: d5b3a5c4a9 am: 6c1f3fbcd2 am: 1ff8962b79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1953436

Change-Id: Idc81838d965832f5d97af67e0006565fe93a3a76
 2022-01-21 17:51:42 +00:00
Hao Ke
1ff8962b79 Merge "Changing readParcelable and readSerializable's method signatures." am: d5b3a5c4a9 am: 6c1f3fbcd2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1953436

Change-Id: I24500f0428749baf7e1da43464982c1bd15c28f2
 2022-01-21 17:33:28 +00:00
Hao Ke
d5b3a5c4a9 Merge "Changing readParcelable and readSerializable's method signatures." 2022-01-21 17:01:04 +00:00
Treehugger Robot
db6062fa8d Merge "[MS29] Remove Trace hidden API dependencies" am: be70a4353a am: 56da05be6c am: e987d6eb82 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952201

Change-Id: I34899dff6aa29ef5940afce89d459d2585d97044
 2022-01-21 09:07:35 +00:00
Treehugger Robot
e987d6eb82 Merge "[MS29] Remove Trace hidden API dependencies" am: be70a4353a am: 56da05be6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952201

Change-Id: I735fbe031bef57ecb7a4e0428bcd56484a9af116
 2022-01-21 08:44:24 +00:00
Treehugger Robot
be70a4353a Merge "[MS29] Remove Trace hidden API dependencies" 2022-01-21 08:29:29 +00:00
Junyu Lai
c048d53e60 [MS29] Remove Trace hidden API dependencies 
Since data usage related code is going to move to mainline module,
hidden classes and methods can no longer be accessed. Thus,
expose the needed system apis since there is no alternative.

Test: TH
Fix: 215152167
Bug: 204830222
Change-Id: I41046f90b9ff8f1755304e5d289584d39599fd13
 2022-01-21 06:34:55 +00:00
Etienne Ruffieux
26f9b5d78b Merge "Making Process.NFC_UID SystemApi for modules" am: 06580338e6 am: d086e8ee72 am: 0fcd2ed905 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945288

Change-Id: I7f153f5c39de361e5b65848792ad35d67dcd00e0
 2022-01-21 00:18:44 +00:00
Etienne Ruffieux
0fcd2ed905 Merge "Making Process.NFC_UID SystemApi for modules" am: 06580338e6 am: d086e8ee72 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945288

Change-Id: I8adadb76c51aa37665ac9847c51e852bd7d933b8
 2022-01-21 00:00:34 +00:00
Etienne Ruffieux
fe195c9b7e Making Process.NFC_UID SystemApi for modules 
In order for Bluetooth to be a mainline module, we need to
remove all hidden APIs calls from and to it. NFC_UID is
used inside BluetoothManagerService so we need to be able
to access it.

Tag: #feature
Test: make
Bug: 211851706
Change-Id: Ie778c4467f5db1efa1f759c405373cc3e34747ca
 2022-01-20 19:09:50 +00:00
Hao Ke
9c4045f7c9 Changing readParcelable and readSerializable's method signatures. 
Bug: 210800751
Test: atest -d android.os.cts.ParcelTest
Change-Id: Ie0a1deafc6e876ea01bfa5cee221ef81fecdfe59
 2022-01-19 17:49:57 +00:00
Junyu Lai
f23caacaf1 Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3cc8 am: 08c51b04ca am: d312550ff8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914533

Change-Id: I13c1439933d33c81e3f8668ad0b86bea2b6b68a7
 2022-01-06 14:23:37 +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
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
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
Dmitri Plotnikov
5ae5ccf9e3 Merge "Add BATTERY_STATS_OWNERS to all *Stats files" am: 884e5d8456 am: b759da54a3 am: c8eaba313f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936287

Change-Id: I7a4e5bb0afdfbee2de431bb17b161225909bb5fc
 2022-01-05 19:09:53 +00:00
Dmitri Plotnikov
c8eaba313f Merge "Add BATTERY_STATS_OWNERS to all *Stats files" am: 884e5d8456 am: b759da54a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936287

Change-Id: I5fc46af02882bd65a5359705e67240809731d4f5
 2022-01-05 00:09:15 +00:00
Dmitri Plotnikov
884e5d8456 Merge "Add BATTERY_STATS_OWNERS to all *Stats files" 2022-01-04 23:42:08 +00:00
Dmitri Plotnikov
5e85751023 Add BATTERY_STATS_OWNERS to all *Stats files 
Test: N/A
Change-Id: Ifb1865b2db902bf0cca1bde48a7381903dca229c
 2022-01-04 15:31:01 -08:00
Treehugger Robot
15ccd2c588 Merge "Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest" am: c9ed425df2 am: 1b148ed131 am: 130599d186 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918645

Change-Id: Ib3847acbafea7e24c97d4577ff1dc1de0b4dfed6
 2021-12-20 15:47:39 +00:00
Treehugger Robot
130599d186 Merge "Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest" am: c9ed425df2 am: 1b148ed131 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918645

Change-Id: I0260a0c7e994d4186dda7553fe5fa44b39c7de2e
 2021-12-20 15:15:33 +00:00
Treehugger Robot
c9ed425df2 Merge "Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest" 2021-12-20 14:33:41 +00:00
Steven Moreland
2cc9570c3b Merge "Binder: recycle Parcel in finally block" am: 8581d27415 am: 0c1dac2572 am: b4f0710e19 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926857

Change-Id: I83621e2ea9fbb09dfea582c81516dc6ebc1118bf
 2021-12-16 18:02:12 +00:00
Steven Moreland
b4f0710e19 Merge "Binder: recycle Parcel in finally block" am: 8581d27415 am: 0c1dac2572 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926857

Change-Id: I822c72fb027da80e39762c03b228e7c966bbe253
 2021-12-16 17:46:12 +00:00
Steven Moreland
8581d27415 Merge "Binder: recycle Parcel in finally block" 2021-12-16 17:16:31 +00:00
Steven Moreland
713c258edc Binder: recycle Parcel in finally block 
If other types of exceptions happen here, we should still recycle the Parcel.

Bug: 207778694
Test: boot
Change-Id: I3375b87a674c45f8bc66848dfaf899497f5acaa8
 2021-12-16 01:03:54 +00:00
Treehugger Robot
891c20d026 Merge "Log UI events to traces" am: a9666fccb9 am: 6e713ddc1e am: 8b81ff8dbc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920746

Change-Id: I6f667d1c10b476abd96a85971f421bad0e17e71d
 2021-12-15 19:02:48 +00:00
Treehugger Robot
8b81ff8dbc Merge "Log UI events to traces" am: a9666fccb9 am: 6e713ddc1e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920746

Change-Id: Ica852f77a0771b6a44bbaffbe019a634f0dc4622
 2021-12-15 18:48:31 +00:00
Treehugger Robot
a9666fccb9 Merge "Log UI events to traces" 2021-12-15 18:11:52 +00:00
Lucas Dupin
2f72aa0bd1 Log UI events to traces 
Add LogBuffer tags to perfetto traces in order to simplify the process
of reading them.

A new track will indicate the state of notification, lock screen, AOD,
etc.

Bug: 207049735
Test: atest TraceDevTest
Change-Id: I3253c0f5a369ad4a25d6646daa62810644553a36
 2021-12-14 21:35:19 +00:00
hupengcheng
b166fcedac Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest 
For dual vibrator device, the AOSP code needs to be adjusted as follow.

Bug: 209932477
Test:
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateComposed
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorIsVibrating
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateMultiThread
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorVibratesNoLongerThanDuration
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateOneShot
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorStateCallback
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratePattern
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratePredefined
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibrateWaveform
run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest#testVibratorCancel

Change-Id: I31afc8179acb4f7749b1208f3abd13a1941a01b2
 2021-12-13 09:38:05 +00:00
Treehugger Robot
fa693ff4c0 Merge "Don't require T to extend Parcelable or Serializable in Parcel" am: 6a2f196dca am: 425b8699bb am: f64706cd2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914047

Change-Id: I36c2b5a97a67dbcde85ed9eea63111391870234c
 2021-12-10 00:55:09 +00:00
Treehugger Robot
f64706cd2f Merge "Don't require T to extend Parcelable or Serializable in Parcel" am: 6a2f196dca am: 425b8699bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914047

Change-Id: Ib68ac2d8097282793bbf5a687721aedac498bfe5
 2021-12-10 00:33:44 +00:00
Treehugger Robot
425b8699bb Merge "Don't require T to extend Parcelable or Serializable in Parcel" am: 6a2f196dca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914047

Change-Id: Ie78e98103a3313414fbef82a808e2a0b3fdeba91
 2021-12-10 00:11:01 +00:00
Hao Ke
31fa514400 Don't require T to extend Parcelable or Serializable in Parcel 
This is because we want to support the use-case where the caller
enforces a specific class type that doesn't implement Parcelable
or Serializable but the child classes written on the payload implement them.

One such use-case that needs this before migrating is
https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/com/android/internal/infra/AndroidFuture.java;l=596;drc=2d6a545e3042d7cc91b54746e774681a05e0ff22:
we need to enforce Throwable class but it doesn't implement Parcelable itself,
while its children written on the wire are expected to.

Test: atest -d android.os.cts.ParcelTest
Bug: 195622897
Change-Id: I150416d0cfb0b87ddbaff1041d8d60aa205f6f39
 2021-12-09 15:40:04 +00:00
Bernardo Rufino
55f69262d0 Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)" am: 2ee662c767 am: 91e53b04aa am: 017bfa357a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910046

Change-Id: Ibd6a6dcfc757ba244333e44b75d9e03907bd0400
 2021-12-09 11:27:09 +00:00
Bernardo Rufino
017bfa357a Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)" am: 2ee662c767 am: 91e53b04aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910046

Change-Id: Id17598162b99da239a2a68dfcc338b036c3a8a31
 2021-12-09 11:17:09 +00:00
Bernardo Rufino
91e53b04aa Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)" am: 2ee662c767 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910046

Change-Id: I3f12c9a32b1b2146ec83f0a04eb5768cafd2eecd
 2021-12-09 10:54:30 +00:00
Bernardo Rufino
2ee662c767 Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)" 2021-12-09 10:35:34 +00:00
Tim Van Patten
78fadbe415 Merge "Correctly call setGpuStats() for ANGLE/system driver" am: c6d9eda8c0 am: 4d3d322f09 am: f47bb4c73e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906687

Change-Id: Ida69e4996e8b738c71461125e3e4f8e7c4c52084
 2021-12-08 17:48:19 +00:00
Tim Van Patten
f47bb4c73e Merge "Correctly call setGpuStats() for ANGLE/system driver" am: c6d9eda8c0 am: 4d3d322f09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906687

Change-Id: I2098eae142d44b482483698e1d5dd47fbb400086
 2021-12-08 17:27:33 +00:00
Tim Van Patten
4d3d322f09 Merge "Correctly call setGpuStats() for ANGLE/system driver" am: c6d9eda8c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906687

Change-Id: I93a7c79612c189198ef1200d471b685c35664694
 2021-12-08 17:10:36 +00:00
Tim Van Patten
c6d9eda8c0 Merge "Correctly call setGpuStats() for ANGLE/system driver" 2021-12-08 16:52:44 +00:00
Evgenii Stepanov
643beefbb9 Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e761 am: 7842e7f363 am: 9399b9981d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910277

Change-Id: Ib57a9388139da44785a73253ea8c8769961db629
 2021-12-07 19:56:14 +00:00
Evgenii Stepanov
9399b9981d Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e761 am: 7842e7f363 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910277

Change-Id: Iaecf2f0ab6145dda58af10bc17f5b171b169e802
 2021-12-07 19:42:08 +00:00
Evgenii Stepanov
7842e7f363 Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e761 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910277

Change-Id: If16ed953afd35c4c58ee7ea966b889a1a3ca62fb
 2021-12-07 19:19:15 +00:00