Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
567,118 Commits 3 Branches 0 Tags
2d4f82f0cfe197cb4a5209e6aa7dcafd98640a4e
Commit Graph

567118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
2d4f82f0cf Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426

Change-Id: Ia433edec97f3a02c95dcf89f9f8ae80244063a89
 2021-04-15 10:01:20 +00:00
Treehugger Robot
3fbec7cf77 Merge "Add test for [set|is]BypassableVpn" 2021-04-15 09:21:57 +00:00
lucaslin
12d6eb2871 Add test for [set|is]BypassableVpn 
Bug: 182963397
Test: 1. atest CtsNetTestCases:NetworkAgentConfigTest
      2. atest CtsNetTestCasesLatestSdk:NetworkAgentConfigTest
Change-Id: I0250a0313d3a7561ab8efa851fbc06f5bce11185
 2021-04-15 15:44:01 +08:00
Treehugger Robot
80b01a7f47 Merge "[Telephony] Physical Channel Config should support DSDS" am: 435ba73a94 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675626

Change-Id: I8c9ebbc8ddab4351fe7a94744ce9b3975d287900
 2021-04-15 06:54:48 +00:00
Treehugger Robot
435ba73a94 Merge "[Telephony] Physical Channel Config should support DSDS" 2021-04-15 06:13:57 +00:00
Treehugger Robot
9d5240865f Merge "Make TYPE_VPN_LEGACY no longer deprecated." am: 590949fd61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675627

Change-Id: Ic86602adb7f4eb9726337e8bc5ba8a652566c94d
 2021-04-15 04:37:13 +00:00
Treehugger Robot
590949fd61 Merge "Make TYPE_VPN_LEGACY no longer deprecated." 2021-04-15 03:57:20 +00:00
Treehugger Robot
e2919bf071 Merge "Grant shell missing permissions" am: 51e5e80876 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670006

Change-Id: I7da950a176408ded482230d21df0fc772192de3a
 2021-04-15 01:32:01 +00:00
Paul Crowley
f61fbc626c Merge "Include OWNERS file that exists" am: 7e20e9f22b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676525

Change-Id: Ic02c278feef326f614ace5d7d91949c0105f127b
 2021-04-15 01:27:07 +00:00
Treehugger Robot
2988998bd3 Merge "Bluetooth OOB: Fix getLeAppearance" am: ef0304a087 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673875

Change-Id: Ibb7c52a0d373644f811fdc4e095c5577efd510ce
 2021-04-15 01:23:58 +00:00
Treehugger Robot
51e5e80876 Merge "Grant shell missing permissions" 2021-04-15 00:52:03 +00:00
Paul Crowley
7e20e9f22b Merge "Include OWNERS file that exists" 2021-04-15 00:48:21 +00:00
Treehugger Robot
ef0304a087 Merge "Bluetooth OOB: Fix getLeAppearance" 2021-04-15 00:34:44 +00:00
Treehugger Robot
b6dd284973 Merge "Shell: Allow usage of UwbManager APIs" am: 762a92d755 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675747

Change-Id: Ibfabd3e95aea88420944c4dc3e44e15fac1ef614
 2021-04-14 23:09:55 +00:00
Treehugger Robot
762a92d755 Merge "Shell: Allow usage of UwbManager APIs" 2021-04-14 22:38:12 +00:00
Roshan Pius
43158d470e Shell: Allow usage of UwbManager APIs 
This permission is needed for uwb CTS tests.

Is the minimally scoped permission that needs to be added?
- Yes, this only allows the app to range to uwb devices.

What options did you explore that did not need this permission?
- Without this permission, it would be impossible to test any of the
UwbManager API's.

Bug: 183747097
Test: Compiles
Change-Id: Ie4264cdcd3f84c965da70f8f8fefe538378c47f6
Merged-In: Ie4264cdcd3f84c965da70f8f8fefe538378c47f6
 2021-04-14 21:01:58 +00:00
Paul Crowley
7234ea3537 Include OWNERS file that exists 
The current OWNERS file includes a file that does not exist. Change
it to a similarly named file that does exist.

Test: n/a
Bug: 163866361
Change-Id: I5681b2fd05a4a010b81f55a00d2384ff9e5ad541
 2021-04-14 12:51:02 -07:00
Anton Hansson
8049f5cda2 Merge "Remove custom android_test.jar disting" am: 6339fba8a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675507

Change-Id: I8540072c32619cf52139b246e9bcf784c27f3c6a
 2021-04-14 17:56:46 +00:00
Anton Hansson
38658a5658 Merge "Run bpfmt on StubLibraries.bp" am: cf54ae883b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675506

Change-Id: I9518c376705f7de903a5ec4bd6f78314bc8e7630
 2021-04-14 17:44:44 +00:00
Paul Duffin
44b2f6cebd Merge "Generalize tools/hiddenapi/checksorted_sha.sh" am: a48ee296ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675866

Change-Id: Ibc62e793e19a4c8c90678a55a91c070d2bf0e3d8
 2021-04-14 17:40:24 +00:00
Paul Duffin
9a4f3c85be Merge "Avoid duplication of compat team email addresses in OWNERS" am: 2435cbfde7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675865

Change-Id: I26ec52be811224269913a3d0703b0b557b2c7262
 2021-04-14 17:35:53 +00:00
Paul Duffin
da8ead7229 Merge "Remove com.android.i18n.phonenumbers from libcore packages" am: 0d80c5c432 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675524

Change-Id: I348fcb5c0a9f18e618b67fe9c432dac08a084733
 2021-04-14 17:25:46 +00:00
Anton Hansson
6339fba8a8 Merge "Remove custom android_test.jar disting" 2021-04-14 17:24:15 +00:00
Anton Hansson
cf54ae883b Merge "Run bpfmt on StubLibraries.bp" 2021-04-14 17:23:42 +00:00
Zoey Chen
5d8dc1e08c Merge "[PhysicalChannelConfig] Add more useful logs when calculate actual frequency" am: 7ffe1efa71 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671793

Change-Id: I2447707c8ece48db7448453c828bd56ecaabae78
 2021-04-14 17:19:27 +00:00
Paul Duffin
a48ee296ee Merge "Generalize tools/hiddenapi/checksorted_sha.sh" 2021-04-14 17:17:50 +00:00
Paul Duffin
2435cbfde7 Merge "Avoid duplication of compat team email addresses in OWNERS" 2021-04-14 17:17:32 +00:00
Paul Duffin
0d80c5c432 Merge "Remove com.android.i18n.phonenumbers from libcore packages" 2021-04-14 17:17:04 +00:00
Zoey Chen
7ffe1efa71 Merge "[PhysicalChannelConfig] Add more useful logs when calculate actual frequency" 2021-04-14 16:32:35 +00:00
Lorenzo Colitti
fb7f36b3cb Make TYPE_VPN_LEGACY no longer deprecated. 
Addresses API council feedback.

Test: m
Fix: 185311050
Change-Id: I93c8c46ceda7b08f9fc0ab8930f6a3c960f30930
 2021-04-14 23:30:48 +09:00
Paul Duffin
11972fd431 Generalize tools/hiddenapi/checksorted_sha.sh 
Stops it being specific to frameworks/base. This change works because
$2 is $(REPO_ROOT) and $(REPO_ROOT)/frameworks/base is the same as $PWD
when this script is used in the frameworks/base repo.

Also removes boot/ from the path that identifies hidden API flag files.
This keeps the directory structure needed in the repositories into
which hidden API flag files will be moved simple by removing the need
to have a boot/ directory. The hiddenapi/ directory is required as the
files need their own separate OWNERS file.

A follow up change will move this file into tools/platform-compat to
allow it to be used by other repos.

Bug: 177892522
Test: try and upload changes to hiddenapi flag files
Change-Id: Ifb3690e7c596249fda84eff82f5a53f0b1b6f991
 2021-04-14 14:42:15 +01:00
Paul Duffin
afb6c9ff98 Avoid duplication of compat team email addresses in OWNERS 
Bug: 177892522
Test: n/a
Change-Id: Id996a51cad9f66e1acc4e260bf1a203088e90607
 2021-04-14 14:42:02 +01:00
Zoey Chen
1ec3a8bc65 [Telephony] Physical Channel Config should support DSDS 
Bug: 185255634
Test: atest TelephonyRegistryTest
Change-Id: Ie6d884b17642958607de6cd44b28a1042ecfa713
Merged-In: Ie6d884b17642958607de6cd44b28a1042ecfa713
 2021-04-14 12:36:49 +00:00
Paul Duffin
08c30bae75 Remove com.android.i18n.phonenumbers from libcore packages 
The com.android.i18n.phonenumbers is not used by any libcore code and
is no longer managed by the libcore team.

Bug: 177892522
Test: n/a
Change-Id: Ib445e652746a8b9b42c6bee7d27a062d6b62a4ec
 2021-04-14 13:30:27 +01:00
Anton Hansson
68615ec0c8 Remove custom android_test.jar disting 
This jar is dist already at apistubs/android/test/android.jar.

Bug: 185128417
Test: in production
Change-Id: Id972b3a8e4e6065bc09e4358e89c6423ed989295
 2021-04-14 12:53:09 +01:00
Anton Hansson
240ee48eec Run bpfmt on StubLibraries.bp 
It's part of the repo hooks now.

Test: No
Change-Id: Iccd07b1ce918fa50a166b106f281f31277391cea
 2021-04-14 12:52:00 +01:00
Anton Hansson
774da343c6 Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673391

Change-Id: I1b320ba1c7332b1126843c106ed6f5452e98472a
 2021-04-14 10:10:47 +00:00
Anton Hansson
c6a0cddfab Merge "Inline usage of jarjar_rules.txt" 2021-04-14 09:45:00 +00:00
Tianjie Xu
cd4836d197 Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649651

Change-Id: I5fc640360434adc032c2bc3691e9fd15eb5ea4b9
 2021-04-14 05:55:51 +00:00
Bill Yi
b67a5b50fa [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours 
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history

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

Change-Id: I92a667574c0f8f8754c6c1c28d90c32f26e8d3b3
 2021-04-14 05:46:16 +00:00
Tianjie Xu
246c14d6da Merge "Improve the error handling for armRebootEscrow" 2021-04-14 05:23:07 +00:00
Bill Yi
8e90abbe39 Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" 2021-04-14 04:59:51 +00:00
Bill Yi
4167bf213c Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE 
Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43
 2021-04-13 19:36:45 -07:00
Allen Su
bf7c109ed6 Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" am: 23bbd41fde 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671789

Change-Id: I735b41ed53ce7d374b5d36c4aee79f73d0334234
 2021-04-14 01:28:46 +00:00
Lorenzo Colitti
b2087b4635 Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I4febfa2d96c678decff23eb08e40ba0e33e4c7bf
 2021-04-14 01:24:19 +00:00
Allen Su
23bbd41fde Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" 2021-04-14 00:31:16 +00:00
Lorenzo Colitti
97b4639efa Merge "Add @RedactionType annotations to VpnTransportInfo." 2021-04-14 00:29:48 +00:00
Bill Yi
d4df20e57f Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE 
Merged-In: I9af489ae7bdd448c552c97d4478f1760a13fb970
Change-Id: I368382a9924b2d3dc697ae6450239f23d5cbf520
 2021-04-13 15:34:44 -07:00
Benedict Wong
5c174ce151 Merge "Remove unused variable in MtuUtils" am: ea4537c920 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673535

Change-Id: If4a2c5ea6d7c31f1f5c88d7d9eb2e782ee69bb0c
 2021-04-13 21:53:50 +00:00
Benedict Wong
ea4537c920 Merge "Remove unused variable in MtuUtils" 2021-04-13 21:10:31 +00:00