Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
566,750 Commits 3 Branches 0 Tags
e67182e502b73c92090643273fcbe170c8ac2d9f
Commit Graph

566750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
e67182e502 Merge "Assign the bit calculation as long to prevent overflow" am: 00ccf9e4d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307

Change-Id: I548347851e102f81cd13516a6a409e74c59859f4
 2021-04-07 04:56:41 +00:00
Chiachang Wang
00ccf9e4d7 Merge "Assign the bit calculation as long to prevent overflow" 2021-04-07 04:24:46 +00:00
Charles Chen
1553bf1dac Merge "Add owners for window related core tests" am: b4e3b04eb5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664404

Change-Id: I4acf24a43548acac928ec2274901add1dd51a455
 2021-04-07 03:32:15 +00:00
Allen Su
823b97e3d1 Merge "Change SipMessage API name" am: bb05a11104 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657802

Change-Id: I3f3315e48071972373cff7b7acb666a34cd7e635
 2021-04-07 03:28:38 +00:00
Charles Chen
b4e3b04eb5 Merge "Add owners for window related core tests" 2021-04-07 03:12:56 +00:00
Allen Su
bb05a11104 Merge "Change SipMessage API name" 2021-04-07 02:41:42 +00:00
Chiachang Wang
0209bf73ac Assign the bit calculation as long to prevent overflow 
The value should be assigned as a long to do the bit calculation
as the mNetworkCapabilities is intended to be a long. Otherwise,
the value will be temporary assigned into an integer then
assigned to the target long. When the bit shift calculation
is out of the integer scope, the calculation will overflow and
result in unexpected bebavior.

Without assigning to a long, ConnectivityServiceTest will get
Out-Of-Memory in StringBuilder while generating toString() in
NetworkCapabilities after updating tests to verify
NET_CAPABILITY_VSIM and NET_CAPABILITY_BIP.

Bug: 130869457
Test: atest FrameworksNetTests
Change-Id: I4d34c1215c7efb6dc352c314107792e3fa512ad7
 2021-04-07 02:06:33 +00:00
Hui Wang
f473395dd1 Merge "isRcsVolteSingleRegistrationCapable need check provisioning status." am: e92c4e2d6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665801

Change-Id: I636d10dfeb1c7f030ef5c6548de21b845a4dfd4a
 2021-04-07 02:00:18 +00:00
Hui Wang
e92c4e2d6f Merge "isRcsVolteSingleRegistrationCapable need check provisioning status." 2021-04-07 01:28:15 +00:00
Treehugger Robot
1d73c8107f Merge "ConnectivityManager: Address review comments from aosp/1595396" am: e3aff37ecf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279

Change-Id: I6653d668d1fdc4370f8d5db1da41214b9755bb4d
 2021-04-07 01:16:24 +00:00
Treehugger Robot
e3aff37ecf Merge "ConnectivityManager: Address review comments from aosp/1595396" 2021-04-07 00:36:27 +00:00
Peter Collingbourne
90a348d820 Merge "Reset PAC keys on thread creation instead of on zygote fork." am: 0c61262792 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653717

Change-Id: I229d50645c03c2de57b2fc4469013b71cc9f780a
 2021-04-06 23:28:06 +00:00
Peter Collingbourne
0c61262792 Merge "Reset PAC keys on thread creation instead of on zygote fork." 2021-04-06 23:02:29 +00:00
Jayant Chowdhary
3c83e580b0 Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as well." am: b2f70b04d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659167

Change-Id: Ia40a8b7d8da08eb964a2ada93478b4a80249f3ac
 2021-04-06 22:24:10 +00:00
Jayant Chowdhary
b2f70b04d4 Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as well." 2021-04-06 21:24:12 +00:00
Christian Wailes
1feef50cc1 Merge "Register ART Service with the System Server" am: c71c3ac9ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582868

Change-Id: Ifd340682a5068a5e067f12859cc7ca06206ca6e4
 2021-04-06 20:42:48 +00:00
Treehugger Robot
e9a927c672 Merge "Add BIND_IMS_SERVICE permission to the shell" am: 00e669c96e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661139

Change-Id: I8c564b0d9d2e2b75cc601238ee22efb88a373c2e
 2021-04-06 20:36:03 +00:00
Christian Wailes
c71c3ac9ab Merge "Register ART Service with the System Server" 2021-04-06 20:30:18 +00:00
Jayant Chowdhary
db762c7e13 getCameraIdListNoLazy : remove system cameras from mTorchStatus as well. 
Bug: 182530469

Test: Make Emulator back camera system camera; atest FlashlightTest.java

Merged-In: I0a149ba3d93a740cfbfdc2d04c1235e648061156
Change-Id: I0a149ba3d93a740cfbfdc2d04c1235e648061156
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit bedb9950c8)
 2021-04-06 20:13:25 +00:00
Treehugger Robot
00e669c96e Merge "Add BIND_IMS_SERVICE permission to the shell" 2021-04-06 20:06:59 +00:00
Treehugger Robot
57977423e1 Merge "[RCS] Remove unused OPTIONS APIs because of the API changes." am: 4fbc7c8640 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664402

Change-Id: Idc7f1196563828e723d3a17bd4ff3acce83154ea
 2021-04-06 19:50:41 +00:00
Treehugger Robot
4fbc7c8640 Merge "[RCS] Remove unused OPTIONS APIs because of the API changes." 2021-04-06 19:19:05 +00:00
Hui Wang
831c860514 isRcsVolteSingleRegistrationCapable need check provisioning status. 
Bug: 181986114
Test: atest TeleServiceTests:RcsProvisioningMonitorTest
Test: atest FrameworksTelephonyTests:com.telephony.ims.RcsConfigTest
Test: atest CtsTelephonyTestCases:android.telephony.ims.cts.ImsServiceTest
Change-Id: I8006910b57a02bb71691f1a8ce03aba6f89fd5c3
 2021-04-06 19:09:40 +00:00
Treehugger Robot
00330273ed Merge "Prevent Caching the Invalid Resource" am: a997cf4420 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646975

Change-Id: I50f07eef2baf91b2f6787c7052217459d5be35dc
 2021-04-06 17:58:07 +00:00
Treehugger Robot
a997cf4420 Merge "Prevent Caching the Invalid Resource" 2021-04-06 17:32:13 +00:00
Paul Duffin
0f8ac7c313 Merge "Update OWNERS files for frameworks/base/boot" am: 2d9637c6fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665363

Change-Id: I83ea487cb055f54e00fff8058f1d57803fe5a9ea
 2021-04-06 17:06:46 +00:00
Roshan Pius
aa9a283fc8 Merge "NetworkCapabilities: Hide copy constructor" am: 8662d38f83 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151

Change-Id: I4e3b8ca8158102bf71b6ab2ca796bdfeeedd7d55
 2021-04-06 16:49:29 +00:00
Roshan Pius
fea4de4d6d ConnectivityManager: Address review comments from aosp/1595396 
Bug: 156867433
Test: atest android.net
Test: atest com.android.server
Change-Id: I7f5d043732ae22edd14bf581b7dc676c9236b545
 2021-04-06 16:42:51 +00:00
Paul Duffin
2d9637c6fe Merge "Update OWNERS files for frameworks/base/boot" 2021-04-06 16:35:35 +00:00
Roshan Pius
8662d38f83 Merge "NetworkCapabilities: Hide copy constructor" 2021-04-06 15:57:47 +00:00
Treehugger Robot
c1c4f87b13 Merge "Add SilkFX OWNERS" am: 4ff50eb031 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664579

Change-Id: Ia71daf4bd521d60fd6540ca84b1b66a959e87ddf
 2021-04-06 15:43:55 +00:00
Treehugger Robot
4ff50eb031 Merge "Add SilkFX OWNERS" 2021-04-06 15:08:32 +00:00
Paul Duffin
4f48fa4d6f Merge "Remove framework-atb-backward-compatibility" am: 9f82ba21f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663339

Change-Id: I657d85cea465713580079624b969b50ff58e8aff
 2021-04-06 14:13:13 +00:00
Treehugger Robot
5aa92f6e27 Merge "Add more OWNERS to more places" am: 0901b326ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661241

Change-Id: I96ecf069f568d01d3d044de2aa2a92b371e37bb5
 2021-04-06 14:09:49 +00:00
Paul Duffin
9f82ba21f1 Merge "Remove framework-atb-backward-compatibility" 2021-04-06 14:09:30 +00:00
Aaron Huang
33fdb4a42a Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645290

Change-Id: I9fe40b60f31f0897f8cb62a39787536cd5524157
 2021-04-06 14:06:51 +00:00
Aaron Huang
f92723b053 Migrate hidden API in IpConfigStore to formal API am: 9503a30900 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577123

Change-Id: I218559824dc81cc1b57f17ef43f3fb29ec0fc4f5
 2021-04-06 14:03:54 +00:00
Anton Hansson
2f3ad490b1 Merge "Remove hwbinder" am: 1bf83b28d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658059

Change-Id: I4372d07c0270ee80794ff2df7a6d41030efa8ea1
 2021-04-06 13:58:41 +00:00
Treehugger Robot
0901b326ad Merge "Add more OWNERS to more places" 2021-04-06 13:30:57 +00:00
Aaron Huang
834026197f Merge changes I5ed1bc8b,Ie9e6af0e 
* changes:
  Fix IpConfigStore dependencies on framework-connectivity
  Migrate hidden API in IpConfigStore to formal API
 2021-04-06 13:20:26 +00:00
Anton Hansson
1bf83b28d9 Merge "Remove hwbinder" 2021-04-06 13:08:56 +00:00
Paul Duffin
7263ded5d8 Update OWNERS files for frameworks/base/boot 
Adds OWNERS files for frameworks/base/boot and its new subdirectory
hiddenapi to include the Soong team and the compat team as they will be
the ones responsible for maintaining the contents of those directories.

A follow up change will move the frameworks/base/config/hiddenapi-*
into the new hiddenapi directory but that change will require separate
changes downstream. Separating this change out avoids having general
frameworks/base reviewers from having to review multiple different
changes for which they have little context.

Bug: 179354495
Test: m nothing
Change-Id: Ia57d69c5b6031ecab9fa3a27e293ce8166ef50d3
 2021-04-06 13:55:37 +01:00
Aaron Huang
06007f0302 Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" am: 248a42ca89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664305

Change-Id: Ic3fca6892c37636dfc0e8470b8e663fda3dfd51a
 2021-04-06 12:42:00 +00:00
Almaz Mingaleev
7851e524e7 Merge "Use isShownInPickerAt instead of isShownInPicker." am: bc3fff46d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655727

Change-Id: I5e2fec1d9494e741da6f80ef2afd312859dddfc5
 2021-04-06 12:37:07 +00:00
Aaron Huang
248a42ca89 Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" 2021-04-06 12:27:53 +00:00
Almaz Mingaleev
bc3fff46d9 Merge "Use isShownInPickerAt instead of isShownInPicker." 2021-04-06 12:10:17 +00:00
Paul Duffin
20c056dacb Remove framework-atb-backward-compatibility 
The class in this library no longer needs to be conditionally included
on the bootclasspath based on the REMOVE_ATB_FROM_BCP flag so is being
built as part of framework-minus-apex.

Bug: 184331423
Test: m nothing
Change-Id: If7c2ec51be0670ffda22e18ce1e028783a1513e7
 2021-04-06 11:41:49 +01:00
Charles Chen
170ab85ce1 Merge "Add owners for window coretest" am: dfefb9e59d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662359

Change-Id: Ie33128d9f0fe014149d7be49d3ac42c4bc59dead
 2021-04-06 10:00:08 +00:00
Charles Chen
275196debe Add owners for window related core tests 
Test: upload test
Bug: 183251523
Change-Id: I81a9bb447b7d3e9fffd4d2f03eca3644be5394f3
 2021-04-06 17:58:47 +08:00
allenwtsu
0f9b6171f1 Change SipMessage API name 
Bug: 184018068
Test: atest
Change-Id: I1c1dbfbcbacadf9bdd07b9b8cd85e8ffda9ac0b3
 2021-04-06 17:28:39 +08:00