Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
687,324 Commits 3 Branches 0 Tags
bd84bca4e16b43a7c854cd2e2d2ca229000f6eeb
Commit Graph

687324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
bd84bca4e1 Merge "enable aapt for unbundled builds" am: c3270b85fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2006150

Change-Id: I0039b269359efb08090b5f7ae8cc5da77bcf6150
 2022-03-03 18:02:25 +00:00
Treehugger Robot
c3270b85fb Merge "enable aapt for unbundled builds" 2022-03-03 17:32:20 +00:00
Treehugger Robot
50987acb5b Merge "Correct volume control symbol for BLE" am: 200dfd387f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990331

Change-Id: I4182d4e7287c174227deac52e7141897191c9b0e
 2022-03-03 02:55:29 +00:00
Treehugger Robot
8f7978d676 Merge "Add an optional extra field description for ACTION_CHANGE_DEFAULT" am: 2b65ebc340 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000590

Change-Id: Icfcf52f3055d4983ba8960d6b653766ab6176677
 2022-03-03 02:55:10 +00:00
Frank Li
ecab80fe20 Merge "[MS68.3] Address comments at aosp/1958144" am: 411168d77b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964907

Change-Id: Idd8ef239098fe5806d099e9392662479dfedebbc
 2022-03-03 02:54:44 +00:00
Treehugger Robot
200dfd387f Merge "Correct volume control symbol for BLE" 2022-03-03 02:50:15 +00:00
Treehugger Robot
2b65ebc340 Merge "Add an optional extra field description for ACTION_CHANGE_DEFAULT" 2022-03-03 02:34:41 +00:00
Frank Li
411168d77b Merge "[MS68.3] Address comments at aosp/1958144" 2022-03-03 02:26:53 +00:00
Chiachang Wang
8344626eba Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" am: d734ce3202 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990334

Change-Id: I9e2a7e483544967ac89052ece6e3f1ed058835f0
 2022-03-03 00:41:11 +00:00
Chiachang Wang
d734ce3202 Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" 2022-03-03 00:10:54 +00:00
Treehugger Robot
1a480d9759 Merge "Fix LicenseHtmlGeneratorFromXml miss files header" am: 0239107ed5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005491

Change-Id: Iad2d1f493d8f7185d7a8a4015dbbbae2bdc4959e
 2022-03-02 22:09:56 +00:00
Treehugger Robot
0239107ed5 Merge "Fix LicenseHtmlGeneratorFromXml miss files header" 2022-03-02 21:44:33 +00:00
Guang Zhu
d6630f5fa7 enable aapt for unbundled builds 
It was available for unbundled builds when the build rules were in mk form and aapt2 is enabled for unbundled, so there's not a strong reason why aapt should be disabled for unbundled build

Change-Id: I6589eafbe8d2e423c9ac925b3614763fa6a511ac
Fixes: 217747798
Test: local compile
 2022-03-02 20:40:45 +00:00
Chaohui Wang
c5dcbc29ad Fix LicenseHtmlGeneratorFromXml miss files header 
Bug: 219375421
Test: Robolectric
Change-Id: I71d24e843e7c5c0c0c5ca6ce9b4e6da08b79f757
 2022-03-02 11:18:09 -08:00
Sandro Montanari
079b5b2e27 Merge "Add /metadata info on dumpsys diskstats and StatsPullAtomService" am: 31f779f949 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993550

Change-Id: Iebb35e4099506f05f73c59dd689e84e75ae8756d
 2022-03-02 18:47:03 +00:00
Sandro Montanari
31f779f949 Merge "Add /metadata info on dumpsys diskstats and StatsPullAtomService" 2022-03-02 18:22:28 +00:00
Nicolas Geoffray
6e933d8124 Merge "Bug fix compiling secondary dexes from cmd line" am: 9cd68de124 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990974

Change-Id: I97780a2f5e68b42141cc4dc6238727230aec58ac
 2022-03-02 17:33:43 +00:00
Bernardo Rufino
7f6ac3e820 Merge "Adjust Class<T> parameter bounds in new Bundle APIs" am: 15b7548d05 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004350

Change-Id: I7beed95d36ba4a83c4e6460dc34d92bdd0873fc8
 2022-03-02 17:32:29 +00:00
Nicolas Geoffray
9cd68de124 Merge "Bug fix compiling secondary dexes from cmd line" 2022-03-02 17:08:52 +00:00
Bernardo Rufino
15b7548d05 Merge "Adjust Class<T> parameter bounds in new Bundle APIs" 2022-03-02 17:00:31 +00:00
Kanyinsola Fapohunda
bd185b4833 Merge "Add kanyinsola to OWNERS file" am: 8c30992302 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005630

Change-Id: Ie6078662220af42fe1c925142f7a6089b0abb086
 2022-03-02 15:28:57 +00:00
Kanyinsola Fapohunda
8c30992302 Merge "Add kanyinsola to OWNERS file" 2022-03-02 15:03:44 +00:00
Neil Fuller
7b559562f7 Merge "Command-line interface: NetworkTimeUpdateService" am: 8ac370e63f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2002571

Change-Id: I1cb528ea3740f8ac54a30f79c4b9aeb7abb6b229
 2022-03-02 13:51:11 +00:00
Rubin Xu
cf3c838d6d Merge "Fix inaccuracy in biometric timeout" am: 2f178de076 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991781

Change-Id: Icc2581bffaa49e085cc4e70182bab4b799bf7a24
 2022-03-02 13:49:59 +00:00
Neil Fuller
8ac370e63f Merge "Command-line interface: NetworkTimeUpdateService" 2022-03-02 13:46:14 +00:00
Rubin Xu
2f178de076 Merge "Fix inaccuracy in biometric timeout" 2022-03-02 13:28:08 +00:00
Frank Li
6321029723 Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" am: 8e7b0f1a00 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894970

Change-Id: I8000c63c159d50d032853abb91723eab20da1e0a
 2022-03-02 12:55:30 +00:00
Frank Li
8e7b0f1a00 Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" 2022-03-02 12:26:11 +00:00
Tom Hsu
2d7c62078c Merge "[Tethering] Add action of carrier unsupported dialog." am: 882c2864f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993171

Change-Id: I3eb65de95df14098d2b284c8d6a7bd9234a724f5
 2022-03-02 11:59:46 +00:00
Tom Hsu
882c2864f3 Merge "[Tethering] Add action of carrier unsupported dialog." 2022-03-02 11:28:50 +00:00
Kanyinsola
44e00a594e Add kanyinsola to OWNERS file 
Test: None
Change-Id: Ib6e86f179b03db2daa2ca6afe4a118786cfe0a43
 2022-03-02 11:13:34 +00:00
Frank Li
35278e3a9e Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" am: 2da74e0820 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004530

Change-Id: I8808a5ae604d0533385e8200d7b06ef43017d21a
 2022-03-02 08:20:49 +00:00
sandrom
f76f5842a4 Add /metadata info on dumpsys diskstats and StatsPullAtomService 
Bug: 208676063
Test: manual tests
Change-Id: Ice3b706222aa1f77beadb1b9f4ae93f0d796a0b0
 2022-03-02 08:08:23 +00:00
Frank Li
2da74e0820 Merge "[DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API" 2022-03-02 07:48:45 +00:00
Paul Hu
1843e673d7 Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" am: 1d30d5d92e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976826

Change-Id: I8c273f9dbb49511b825982ade9a28e233eed00c9
 2022-03-02 07:27:23 +00:00
Paul Hu
1d30d5d92e Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" 2022-03-02 07:11:25 +00:00
Treehugger Robot
246ac29454 Merge "Move BluetoothProfileConnectionInfoTest to cts" am: 56985cebe1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003030

Change-Id: Id6622dd876e2585c5349f523c084d560b365adcf
 2022-03-02 04:03:21 +00:00
Treehugger Robot
56985cebe1 Merge "Move BluetoothProfileConnectionInfoTest to cts" 2022-03-02 03:37:46 +00:00
lifr
c8d48831b9 [SUBID01-0]Grow NetworkIdentity to include a new mSubId field 
In the previous design of NSS and NPMS, those only had IMSI to identify
the cell network. Now the telephony has created the "subId" handle,
which is the preferred mechanism for identifying subscribers.

This commit adds NetworkStats support for subscriberId as a part of
the network identity key

Bug: 80526261
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
            NetworkStatsServiceTest NetworkIdentityTest
            NetworkStatsDataMigrationUtilsTest

 (cherry-picked from ag/16825721)

Change-Id: Ie1fe81006555dbcca4b62457fa6c319f04b4576d
Merged-In: Ie1fe81006555dbcca4b62457fa6c319f04b4576d
 2022-03-02 11:20:09 +08:00
Chiachang Wang
b1dc9fc8d8 Rename getRequiresInternetValidation to isInternetValidationRequired 
Update naming from getRequiresInternetValidation to
isInternedValdiationRequired. This addresses API
review feedback.

Bug: 220129160
Test: atest FrameworksNetTests
CTS-Coverage-Bug: 220129160
Change-Id: I9e25890af6ed73538e9e44381bf05d587808c8de
 2022-03-02 01:01:20 +00:00
Colin Cross
e3086a9896 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: Iab0ad2e55f21ba464ae1b7d4c3ac3252638f711b
 2022-03-02 00:13:00 +00:00
Colin Cross
a789b92644 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" 2022-03-02 00:01:05 +00:00
Treehugger Robot
53f21f4aae Merge "Reverted the ApnSetting behavior" am: 88b3357538 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004910

Change-Id: I8a47c3fff9df8fc7bd172e842fe1a38956bfb8e5
 2022-03-01 23:18:18 +00:00
Treehugger Robot
88b3357538 Merge "Reverted the ApnSetting behavior" 2022-03-01 22:59:11 +00:00
Jack Yu
ba84372d08 Reverted the ApnSetting behavior 
Returning null is already a behavior mentioned in the
public API document. Reverted the behavior back to be consistent
with Android 12.

Fix: 201089892
Test: atest CtsDevicePolicyManagerTestCases
Merged-In: Id4c8b41b23adfe931b9953113f7175a11703dc10
Change-Id: Id4c8b41b23adfe931b9953113f7175a11703dc10
 2022-03-01 13:52:05 -08:00
tom hsu
ad950aa3a2 [Tethering] Add action of carrier unsupported dialog. 
Bug: 161206517
Test: local manual testing
Test: added cts test for new activity
Change-Id: I0223d262817088b4eb8b62612fbb51dcfb98f653
 2022-03-01 20:58:58 +00:00
Treehugger Robot
7b17653639 Merge "Keystore: Support Curve 25519 in the SPI layer" am: 76cee808e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984970

Change-Id: Ia2cf9182ba121878d7ea2bb9e30961637ac18518
 2022-03-01 19:41:58 +00:00
Treehugger Robot
76cee808e2 Merge "Keystore: Support Curve 25519 in the SPI layer" 2022-03-01 19:23:21 +00:00
Frank
a1706b4ef8 [MS68.3] Address comments at aosp/1958144 
Test: atest TrafficStatsTest NetworkUsageStatsTest FrameworksNetTests
Bug: 204830222

(cherry-picked from ag/16813003)

Change-Id: I5a54b44294021d64d8506eeb570db0db8544472a
Merged-In: I5a54b44294021d64d8506eeb570db0db8544472a
 2022-03-02 03:05:53 +08:00
Frank
767c2e7907 [DU03-4]Add NETWORK_STACK Permission check for NetworkStatsService API 
1. getUidStatsForTransport API

Bug: 210066922
Test: atest BatteryStatsImplTest WifiPowerCalculatorTest
            MobileRadioPowerCalculatorTest NetworkStatsServiceTest

(cherry-picked from ag/16816095)

Change-Id: I022c34b5af87fe3ff6857ea264bac2f7098eaed4
Merged-In: I022c34b5af87fe3ff6857ea264bac2f7098eaed4
 2022-03-02 02:30:51 +08:00