Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
558,642 Commits 3 Branches 0 Tags
120a3441b8646d5bf72e8913eaf8f54cce21f491
Commit Graph

558642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
120a3441b8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7869492af986dfc45138bee058954d5109c53087
 2020-12-04 17:23:23 -08:00
Brad Ebinger
473917aa5b Merge "Fix incorrect cache checking of string config values" am: ad55c3468b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1516042

Change-Id: Ie60ca2003fd4a940d09b4e6964295ba3567021d2
 2020-12-03 21:31:49 +00:00
Brad Ebinger
ad55c3468b Merge "Fix incorrect cache checking of string config values" 2020-12-03 20:35:14 +00:00
Mingming Cai
bbeb5eb6f6 Merge "Add CQI and table index to LTE and NR CellSignalStrength" am: 8dd47fcfc5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510593

Change-Id: I5a043c5acbef66825381d01ae6a4e6f66a374524
 2020-12-03 20:07:15 +00:00
Treehugger Robot
9fa0668d29 Merge "BluetoothClass: Use mask to get MajorDeviceClass" am: a9f7570de6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1516221

Change-Id: I676d00b58e36a1b15201c96436507cc05a3b36c2
 2020-12-03 20:03:09 +00:00
Mingming Cai
8dd47fcfc5 Merge "Add CQI and table index to LTE and NR CellSignalStrength" 2020-12-03 19:13:21 +00:00
Treehugger Robot
a9f7570de6 Merge "BluetoothClass: Use mask to get MajorDeviceClass" 2020-12-03 19:00:23 +00:00
Treehugger Robot
161a88303b Merge "Remove dependency on ModuleTestUtils" am: b8fca94cfe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487756

Change-Id: Ib264dbe5a46612da1e1fb03c038b1d763372868f
 2020-12-03 15:15:42 +00:00
Treehugger Robot
b8fca94cfe Merge "Remove dependency on ModuleTestUtils" 2020-12-03 14:58:46 +00:00
Treehugger Robot
02bfb62cab Merge "Add ART optimization dimension to reportFullyDrawn" am: f5d8e97da6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1514752

Change-Id: I5e735509424d48d75c0940898cbd85fe61fd981f
 2020-12-03 12:55:49 +00:00
Treehugger Robot
f5d8e97da6 Merge "Add ART optimization dimension to reportFullyDrawn" 2020-12-03 11:55:52 +00:00
Patrick Rohr
3148f011e0 Merge changes from topic "restricted-networking-mode" am: 176ba02184 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505234

Change-Id: I5e1d114c34e185d0b7f9bc68772431065d852dd0
 2020-12-03 11:41:07 +00:00
Patrick Rohr
b2e7bdd8ac Clean Up NetworkManagementService Tests am: 73a74fa6dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505233

Change-Id: Ia14b1784f36d54f0ba73d5841afedcf8a55a18f2
 2020-12-03 11:36:15 +00:00
Aaron Huang
bff4bfd6c5 Merge "Migrate Slog to Log used in connectivity service module" am: 3de9a7240f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483963

Change-Id: Ifc655142710654983dc969398f75fd84a2bc0c6e
 2020-12-03 10:58:16 +00:00
Patrick Rohr
176ba02184 Merge changes from topic "restricted-networking-mode" 
* changes:
  Add Restricted Mode Firewall Chain
  Clean Up NetworkManagementService Tests
 2020-12-03 10:50:25 +00:00
Aaron Huang
3de9a7240f Merge "Migrate Slog to Log used in connectivity service module" 2020-12-03 10:17:45 +00:00
Myles Watson
89bf39528f BluetoothClass: Use mask to get MajorDeviceClass 
Bug: 174650196
Test: compiles
Change-Id: I6042a02fa329c5291aa7b9719907485e748582bf
 2020-12-02 20:48:08 -08:00
Remi NGUYEN VAN
a25a3759ab Merge "Remove hidden API usage in metrics toString" am: 179419f810 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512876

Change-Id: Ie5c89993c019770cdf71818565ed86f50fe9fcd1
 2020-12-03 03:47:27 +00:00
Remi NGUYEN VAN
179419f810 Merge "Remove hidden API usage in metrics toString" 2020-12-03 03:21:42 +00:00
Xin Li
9e27e114af Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master 2020-12-03 03:18:49 +00:00
Remi NGUYEN VAN
46c03b4179 Merge "Do not query CS in NetworkProvider constructor" am: 692a8748a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512873

Change-Id: I227076074a2d58a4b9e5e8aaa972c6338887f568
 2020-12-03 02:17:16 +00:00
Remi NGUYEN VAN
692a8748a5 Merge "Do not query CS in NetworkProvider constructor" 2020-12-03 01:48:01 +00:00
Mingming Cai
f4753f6373 Add CQI and table index to LTE and NR CellSignalStrength 
Bug: 170771377
Test: make
Change-Id: I4c9281d5a606d3371d53020af3470e6f0f04524f
 2020-12-02 17:20:15 -08:00
Treehugger Robot
839fca8ad5 Merge "SystemServer: fix an infinite loop in TvInputManagerService [1/1]" am: deb1024b75 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512821

Change-Id: Iba29c8868fc8e682b20cd22a9fa476f9bae1648f
 2020-12-02 22:56:13 +00:00
Treehugger Robot
deb1024b75 Merge "SystemServer: fix an infinite loop in TvInputManagerService [1/1]" 2020-12-02 22:00:27 +00:00
Treehugger Robot
3089e5eb0e Merge "Make auto time source suggestions prioritisation configurable." am: f86411654e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513323

Change-Id: I71c51e5506d25103b56e54d8921878032e1621cf
 2020-12-02 20:11:30 +00:00
Mohammad Samiul Islam
3a2612c9d2 Remove dependency on ModuleTestUtils 
Bug: 160296318
Test: atest StagedInstallInternalTest
Change-Id: Ic311aeaf4801c3b7c0dc5cd7a222cc304bba1335
Merged-In: Ic311aeaf4801c3b7c0dc5cd7a222cc304bba1335
 2020-12-02 19:49:49 +00:00
Brad Ebinger
32fd8e5692 Fix incorrect cache checking of string config values 
Bug: 174541711
Test: atest CtsTelephonyTestCases:ImsServiceTest
Change-Id: Idca646dc7cbd562b357092967245cd7aa48a7c86
 2020-12-02 11:48:38 -08:00
Treehugger Robot
f86411654e Merge "Make auto time source suggestions prioritisation configurable." 2020-12-02 19:04:09 +00:00
Treehugger Robot
831f02d294 Merge "Turn vibrator off explicitly on waveforms when amplitude is zero" am: 240fe52811 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1501672

Change-Id: Icd9bae7e30da84db335a5d490d26e5cd504e3be0
 2020-12-02 18:37:27 +00:00
Treehugger Robot
240fe52811 Merge "Turn vibrator off explicitly on waveforms when amplitude is zero" 2020-12-02 17:59:09 +00:00
Almaz Mingaleev
a80891bebe Make auto time source suggestions prioritisation configurable. 
Also get prefix is removed from Callback.getAutoOriginPriorities
to make it consistent with the rest of the interface.
Extra information added to TimeDetectorStrategyImpl dump.

Bug: 172230856
Test: atest
frameworks/base/services/tests/servicestests/src/com/android/server/timedetector

Change-Id: I2a67414d4f2b9d972507052c7c2c817d59be59ba
Merged-In: I2a67414d4f2b9d972507052c7c2c817d59be59ba
 2020-12-02 17:27:16 +00:00
James Lin
3a435016f4 Merge "[RCS UCE] Modify the data type of parameter retryAfter from String to long" am: 7a964f2199 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512645

Change-Id: I5b55660d9a51490be1e2986fc1213cecf5354d3e
 2020-12-02 15:39:28 +00:00
James Lin
7a964f2199 Merge "[RCS UCE] Modify the data type of parameter retryAfter from String to long" 2020-12-02 15:15:26 +00:00
Treehugger Robot
9f5b01e691 Merge "Update comment for new proto directory" am: 777d7d838a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513316

Change-Id: If5fba0cd4a870e06cee7dff1154c3aa9007edc0c
 2020-12-02 13:55:51 +00:00
Treehugger Robot
777d7d838a Merge "Update comment for new proto directory" 2020-12-02 13:08:47 +00:00
Remi NGUYEN VAN
5e5cd117c5 Merge "Remove CaptivePortal deps on @hide MetricEvents" am: e8f300c360 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513141

Change-Id: I647b1cc3329c527d9afa507864700a521a0908be
 2020-12-02 11:53:59 +00:00
Remi NGUYEN VAN
e8f300c360 Merge "Remove CaptivePortal deps on @hide MetricEvents" 2020-12-02 11:12:56 +00:00
an.xi
24d32f5a98 SystemServer: fix an infinite loop in TvInputManagerService [1/1] 
PD#SWPL-6385
Bug:174639896

Problem:
There could be an infinite loop when TvInputManagerService processes
a DeathRecipient's callback and fails to remove its session

Solution:
Do the clear work to make sure the related session is removed finally

Verify:
verify it on Marconi

Change-Id: I9bd79fbc49b8283691870f1e745b324d1322b292
Signed-off-by: an.xi <an.xi@amlogic.com>
 2020-12-02 19:10:37 +08:00
Remi NGUYEN VAN
41e94b11c8 Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 71cd774f68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885

Change-Id: I0eb069c5ed0daca29f1bc4d3fd62f83879985b1c
 2020-12-02 10:05:42 +00:00
Remi NGUYEN VAN
71cd774f68 Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" 2020-12-02 09:23:27 +00:00
Remi NGUYEN VAN
c755617364 Remove hidden API usage in metrics toString 
Remove usage of hidden NetworkType, transport APIs in toString()
implementations of metrics and data usage classes.

The toString implementations can log the transports or network type as
hex or raw indices. While slightly less readable, the metrics classes
and network type APIs are deprecated.

Bug: 174436414
Test: m
Change-Id: I79239a540b66dadd3bbe0a997960530878331358
 2020-12-02 18:10:59 +09:00
Xin Li
d31ee38811 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 
Bug: 172690556
Merged-In: I78222391b83a4add8e964340ec08bb8a1306e1c6
Change-Id: I28bbf40820674675ccf765c912aa8140d3f74ab2
 2020-12-02 00:38:58 -08:00
Jakub Pawlowski
cc691aa7ac Merge "Add Bluetooth LE Audio Profile (3/3)" am: dfe8d9caed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511334

Change-Id: I718f2ab189e9159e47cd2e846e0005b7b3e7e8e1
 2020-12-02 08:22:01 +00:00
Jakub Pawlowski
dfe8d9caed Merge "Add Bluetooth LE Audio Profile (3/3)" 2020-12-02 08:14:59 +00:00
Lorenzo Colitti
88f10e63bb Merge changes Ic5a3e169,I76daa3ab am: 8ca385688d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512888

Change-Id: Ibc9ad6c89e1214302b92118a01a924fa1481767e
 2020-12-02 05:23:05 +00:00
Lorenzo Colitti
8ca385688d Merge changes Ic5a3e169,I76daa3ab 
* changes:
  Refactor applyUnderlyingCapabilities and its test.
  Move applyUnderlyingCapabilities to ConnectivityService.
 2020-12-02 04:55:12 +00:00
Remi NGUYEN VAN
1b06ca6e89 Remove CaptivePortal deps on @hide MetricEvents 
The legacy metrics are deprecated, and CaptivePortal is planned to move
to a connectivity-specific jar which cannot reference MetricsEvents.

Bug: 171540887
Test: m
Change-Id: I409375de3844a7fedef707cf9e19a106d82a8e3a
 2020-12-02 13:17:09 +09:00
Lucas Lin
374ccf4359 Merge "Use public API of NetworkAgent in TestNetworkService" am: 0903bf5de7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505291

Change-Id: If37614f211ea2cddb98f06b95b9dfe32e5a98cb5
 2020-12-02 03:58:08 +00:00
Lucas Lin
0903bf5de7 Merge "Use public API of NetworkAgent in TestNetworkService" 2020-12-02 03:30:59 +00:00