Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
569,048 Commits 3 Branches 0 Tags
9ef0cdbbc37e463d69310b0ef983232f30d074df
Commit Graph

569048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Chang
9ef0cdbbc3 Merge "Add callbacks to indicate NFC setControllerAlwaysOn state changed" am: cfc798e793 am: c5e292c9aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657764

Change-Id: I018c5bb54973007891b4565b2327a42d15c11918
 2021-04-07 12:22:49 +00:00
George Chang
c5e292c9aa Merge "Add callbacks to indicate NFC setControllerAlwaysOn state changed" am: cfc798e793 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657764

Change-Id: Ifa60adda0843a8e6dda1c974d2a4bc354de2df77
 2021-04-07 11:41:30 +00:00
Treehugger Robot
995e378307 Merge "Expose constants of ConnectivityManager" am: 5d7d6554c2 am: d7080db9f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579805

Change-Id: Ibd12c85a42d9b0c13113923c3a61dde7f2cd3e5a
 2021-04-07 11:25:59 +00:00
George Chang
cfc798e793 Merge "Add callbacks to indicate NFC setControllerAlwaysOn state changed" 2021-04-07 11:16:10 +00:00
Treehugger Robot
d7080db9f3 Merge "Expose constants of ConnectivityManager" am: 5d7d6554c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579805

Change-Id: I0e3930444640a8bff7b0f9846cd2ce0e92df8d6f
 2021-04-07 10:42:47 +00:00
Treehugger Robot
5d7d6554c2 Merge "Expose constants of ConnectivityManager" 2021-04-07 10:11:06 +00:00
lucaslin
68a69cc6b7 Expose constants of ConnectivityManager 
The callers cannot call the hidden APIs after ConnectivityManager
became a part of mainline module, so expose them for callers.
Also change the value of ACTION_PROMPT_PARTIAL_CONNECTIVITY,
ACTION_PROMPT_LOST_VALIDATION and ACTION_PROMPT_UNVALIDATED because
of API lint errors.

Bug: 172183305
Test: Check private DNS settings is normal, and test NO_INTERNET
      notification can be shown normally.
Change-Id: I715c766ad8e5eb54f4dc67239c1dbca7239506fc
Merged-In: I715c766ad8e5eb54f4dc67239c1dbca7239506fc
 2021-04-07 09:13:46 +00:00
Jeff Chang
19840369e1 Merge "Add more OWNERS coverage" am: a40fbcd94c am: 018eaf4357 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531866

Change-Id: Ic0a2565f23be69bd573d0ba4bb6cd19fa5eb46d9
 2021-04-07 07:29:55 +00:00
Jeff Chang
018eaf4357 Merge "Add more OWNERS coverage" am: a40fbcd94c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531866

Change-Id: I671d7008e835b06f00a6f3b521035afb2e5dfe10
 2021-04-07 06:48:37 +00:00
Treehugger Robot
b5490b203a Merge "Split networkDestroy() and destroyNetworkCache()" am: 79bb9aa9a4 am: 2e53c839a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554020

Change-Id: Ibe4408e7eb1b23abe0ff8e92b06d4a04f26962de
 2021-04-07 06:01:13 +00:00
Jeff Chang
a40fbcd94c Merge "Add more OWNERS coverage" 2021-04-07 05:57:30 +00:00
Treehugger Robot
2e53c839a1 Merge "Split networkDestroy() and destroyNetworkCache()" am: 79bb9aa9a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554020

Change-Id: I517e242589fa979826c65817d5918ce05ced9866
 2021-04-07 05:40:17 +00:00
Chiachang Wang
d0a92ee2f5 Merge "Assign the bit calculation as long to prevent overflow" am: 00ccf9e4d7 am: e67182e502 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307

Change-Id: I68844967fbef3cffb7211ce72fd502ae19c331c8
 2021-04-07 05:39:01 +00:00
Treehugger Robot
79bb9aa9a4 Merge "Split networkDestroy() and destroyNetworkCache()" 2021-04-07 05:05:46 +00:00
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
d51fbb5b46 Merge "Add owners for window related core tests" am: b4e3b04eb5 am: 1553bf1dac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664404

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

Change-Id: Ide4f9f8a50ed9ade9171f7729bac6bb8f1817f9c
 2021-04-07 04:16:52 +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
Hui Wang
a5d2fa58a8 Merge "isRcsVolteSingleRegistrationCapable need check provisioning status." am: e92c4e2d6f am: f473395dd1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665801

Change-Id: I498df9e6564902a759733dc3c1df81df7c496eed
 2021-04-07 02:21:36 +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
Treehugger Robot
7acd4c1c84 Merge "ConnectivityManager: Address review comments from aosp/1595396" am: e3aff37ecf am: 1d73c8107f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279

Change-Id: I9fe5fb1cbbbae44e91efe90107c220a7b64d9755
 2021-04-07 02:00:09 +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
d7d903b3cb Merge "Reset PAC keys on thread creation instead of on zygote fork." am: 0c61262792 am: 90a348d820 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653717

Change-Id: I14ac222d70af1c218ebb398e38cf850ab784749f
 2021-04-07 00:11:34 +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
Jayant Chowdhary
d5e80336f6 [automerger skipped] Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as well." am: b2f70b04d4 am: 3c83e580b0 -s ours 
am skip reason: skip tag Change-Id I0a149ba3d93a740cfbfdc2d04c1235e648061156 with SHA-1 02622abbe2 is already in history

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

Change-Id: I9cb5fa863d5bbcfc29df220f441f87ac83dce6b0
 2021-04-06 23:07:47 +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
6033dd2aa0 Merge "Register ART Service with the System Server" am: c71c3ac9ab am: 1feef50cc1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582868

Change-Id: I846d3793200cd4068d63b9bc0d9ef1912c3b5613
 2021-04-06 21:08:50 +00:00
Treehugger Robot
637853536e Merge "Add BIND_IMS_SERVICE permission to the shell" am: 00e669c96e am: e9a927c672 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661139

Change-Id: I6db0b69e916401d7116c427015a8ecd9746e93ef
 2021-04-06 21:07:57 +00:00
Treehugger Robot
69700bfe9a Merge "[RCS] Remove unused OPTIONS APIs because of the API changes." am: 4fbc7c8640 am: 57977423e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664402

Change-Id: I653aeae56ce5fca666caa31f659422431d5c6e86
 2021-04-06 21:07:21 +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
3915c76a13 Merge "Prevent Caching the Invalid Resource" am: a997cf4420 am: 00330273ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646975

Change-Id: I62b026efe21adfceb24235da89f7bca8385ed22e
 2021-04-06 18:42:36 +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
Paul Duffin
eca71c137d Merge "Update OWNERS files for frameworks/base/boot" am: 2d9637c6fe am: 0f8ac7c313 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665363

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

Change-Id: If4d2d06c0e3ca6793dcb6139d3cd197e33f5aab7
 2021-04-06 17:36:58 +00:00