Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
813,479 Commits 3 Branches 0 Tags
33a8ba28dfb47cd605c192547d2cb334e61e89cd
Commit Graph

813479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
1a7736be63 Merge "Change the wait time of setDefaultLauncher from 20s to 60s" am: f525d4093f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2452428

Change-Id: I962b3d68e98c2185fa6de09472cce83b2b810d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 11:16:54 +00:00
lucaslin
fae5b6988b Clear the information of the underlying network 
The NetworkCapabilities and LinkProperties of the underlying
network should be cleared when there is a new underlying network.

Currently, Vpn.java only clear both NetworkCapabilities and
LinkProperties of the underlying when onLost() is called or when
the VPN is disconnected. But onLost() won't be fired if the device
is connected to mobile data first, then connects to wifi later.
For this case, both mUnderlyingNetworkCapabilities and mUnderlyingLinkProperties keep the old value until onLinkPropertiesChanged() and onNetworkCapabilitiesChanged() are
called.

Test: atest FrameworksNetTests
Change-Id: I5caa1e0217190062eb84a064bb1bb3aff725dd66
 2023-02-24 10:24:11 +00:00
Alexei Nicoara
feb7fd809a Merge "Updating rollback OWNERS file" 2023-02-24 10:05:09 +00:00
Robert Shih
5a297d5d39 Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" am: a20d36c086 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000331

Change-Id: I325b058a8aeb867ef27abe0fc78480bbe393128a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:40:49 +00:00
Treehugger Robot
f525d4093f Merge "Change the wait time of setDefaultLauncher from 20s to 60s" 2023-02-24 07:48:20 +00:00
Robert Shih
a20d36c086 Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" 2023-02-24 07:01:19 +00:00
Yuncheol Heo
d38aad7979 Merge "prevent crash with pin protected user and taskview" am: b98b2c84e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392794

Change-Id: Ia34c039c671c727e5d5b179faef5ee58857ce87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 05:43:09 +00:00
Treehugger Robot
a513296aa1 Merge "Make sure gc_urgent is normal mode, when no need GC" am: 2534f6c8cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2280527

Change-Id: I28464dc425e416f0790e5e6b0e3cc099aedb05fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 03:06:33 +00:00
Yuncheol Heo
b98b2c84e7 Merge "prevent crash with pin protected user and taskview" 2023-02-24 01:14:40 +00:00
Treehugger Robot
2534f6c8cf Merge "Make sure gc_urgent is normal mode, when no need GC" 2023-02-24 01:06:19 +00:00
Shuzhen Wang
9a6f2a0f51 Merge "Camera: document multiResolution raw behavior" am: ae41acbe90 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2452865

Change-Id: Ic79185c1a6d607cd22117d55803633611f5d3256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 23:53:41 +00:00
Shuzhen Wang
ae41acbe90 Merge "Camera: document multiResolution raw behavior" 2023-02-23 20:22:56 +00:00
Jihoon Kang
ebda7db742 Update API text file format to include missing generic signature 
Currently, API text file does not include type parameter list for
constructor item. This change reformats the api text file to include the
missing type parameter list, with respect to the change in the behavior
of metalava.

Test: m update-api
Bug: 269135125
Change-Id: I46d364291615eabe071eab2dfc28796448f3139e
 2023-02-23 20:01:09 +00:00
Alexei Nicoara
fb9a5cbeea Updating rollback OWNERS file 
Change-Id: Ie4c26a2973c80c860bdba9a1515412e69a27d74e
 2023-02-23 17:08:24 +00:00
Robin Lee
dd803de113 Merge "Add self as OWNER for wm/" am: ad8a6ffcc6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2450482

Change-Id: I666c70dd986d3371aaf85e2ff8e6dd9b42ca40e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 10:17:57 +00:00
Robin Lee
ad8a6ffcc6 Merge "Add self as OWNER for wm/" 2023-02-23 09:41:27 +00:00
William Escande
a4875f76c5 Merge "Snoop Logger: fix descriptions" am: d7780a2fe3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2446842

Change-Id: I0d255cdc1c602c987108d50afff3c8455adaec63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:32:53 +00:00
Jack Wu
c3563cca9a Merge changes from topic "batteryStateOfHealth" am: 9614aa9ce8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2442659

Change-Id: Id9c59f7265f2494101e7bbcdcdb7c9d334f29e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:30:04 +00:00
Jack Wu
29c416f10b BatteryManager: Add new battery intent and property am: 5c264266cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2441721

Change-Id: Iffc18abf984f23718d90c295491c04a51c824748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:29:53 +00:00
Anvesh Renikindi
9ac01843cf [automerger skipped] Merge "Update ActivityEmbedding Usage" am: 1d09d64460 -s ours 
am skip reason: Merged-In Ic0e0ffcd576eed31a10d682bb0efdff5d1773b7d with SHA-1 36e9bf03ef is already in history

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

Change-Id: I2239e2341f5682d668ea12bd88c1e606bb00f36c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:27:22 +00:00
Diego Vela
c09a10ea4d [automerger skipped] Update ActivityEmbedding Usage am: b788d592b5 -s ours 
am skip reason: Merged-In Ic0e0ffcd576eed31a10d682bb0efdff5d1773b7d with SHA-1 36e9bf03ef is already in history

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

Change-Id: Ib8b50d3a4c788caf9d5643101e44c7bc6ca4e813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:27:12 +00:00
gang.huang
391aaf65c5 Change the wait time of setDefaultLauncher from 20s to 60s 
On some low-performance devices, the method setDefaultLauncher can not be completed whithin 20s

Change-Id: Iab78a57d4329095358cad6e79088909b48a22264
 2023-02-23 15:18:50 +08:00
William Escande
d7780a2fe3 Merge "Snoop Logger: fix descriptions" 2023-02-23 07:09:49 +00:00
Shuzhen Wang
2ec8d2cac7 Camera: document multiResolution raw behavior 
Document that mutiResolution RAW can be supported for a logical camera
without RAW capability.

Test: Build
Bug: 269221911
Change-Id: I24269dd63c6f354a53c39de513a140907a0e41d2
Merged-In: I24269dd63c6f354a53c39de513a140907a0e41d2
 2023-02-23 06:45:23 +00:00
Jack Wu
9614aa9ce8 Merge changes from topic "batteryStateOfHealth" 
* changes:
  BatteryManager: stateOfHealth is a property
  BatteryManager: Add new battery intent and property
 2023-02-23 06:45:17 +00:00
Anvesh Renikindi
1d09d64460 Merge "Update ActivityEmbedding Usage" 2023-02-23 06:22:15 +00:00
AleX Pelosi
f25f8106ae BatteryManager: stateOfHealth is a property 
Read batteryStateOfHealth from HealthData with access control

Bug: 251427118
Test: m update-api ; m
Change-Id: Ida87ef9f59c32cf52b036f37c7c261d03d3b4c37
Signed-off-by: AleX Pelosi <apelosi@google.com>
 2023-02-23 01:25:41 +00:00
Jack Wu
5c264266cc BatteryManager: Add new battery intent and property 
These are going to be public:
- Battery state of health
- Battery cycle count
- Charging status

These are going to be system API
- BATTERY_PROPERTY_MANUFACTURING_DATE
- BATTERY_PROPERTY_FIRST_USAGE_DATE
- BATTERY_PROPERTY_CHARGING_POLICY

Bug: 251427118
Test: m
Change-Id: If74b96d7657611934d293df8376296e373ec9b35
Signed-off-by: AleX Pelosi <apelosi@google.com>
Signed-off-by: Jack Wu <wjack@google.com>
 2023-02-23 01:25:29 +00:00
Treehugger Robot
c4e2977534 Merge "nfc(api): Remove fg checks from API class" am: b963d9a008 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2448864

Change-Id: I2aca1427974c788bcfb07b42f554e505ce1874ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:56:15 +00:00
Treehugger Robot
b963d9a008 Merge "nfc(api): Remove fg checks from API class" 2023-02-22 20:51:49 +00:00
Mikhail Naganov
2a60337c35 Merge "Fix refactoring error in MicrophoneInfo" am: 5899437c3f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2448863

Change-Id: I8f0ce71d8733d228488611088fd06cd76bc6f383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:16:16 +00:00
Mikhail Naganov
5899437c3f Merge "Fix refactoring error in MicrophoneInfo" 2023-02-22 17:26:46 +00:00
Roland Levillain
6d8ee15a7a Merge "Temporarily disable testBackgroundDexOptDowngradeSuccessful." am: f4daf63940 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2448063

Change-Id: Ida34d9c9293e8fb7e79d865477a972047450402a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 16:58:35 +00:00
Roshan Pius
d6cd6eb7be nfc(api): Remove fg checks from API class 
Instead of checking this in the API class, throw a remote exception from
service when we detect that a non-fg app is trying to enable/disable fg
dispatch. The service is already tracking the app moving to background,
so there is no need for this redundant tracking in the API class.

Bug: 263565738
Test: atest CtsNfcTestCases
Test: CtsVerifier tag tests
Change-Id: Ia04848f6ed2595b33a861427d1d346d0dc9da8a5
 2023-02-22 16:46:15 +00:00
Roland Levillain
f4daf63940 Merge "Temporarily disable testBackgroundDexOptDowngradeSuccessful." 2023-02-22 15:13:41 +00:00
Ian Baker
a44c29cd16 Merge "RingtoneManager#setActualDefaultRingtone() open OutputStream of cacheUri with "wt" mode" am: f922e9fa40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2447583

Change-Id: I2fb1029ee017bb51b22644bb9298aa9ffbd9981d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 11:47:44 +00:00
SongFerng Wang
44825f3bd6 Merge "Fix the text color in the dark theme" am: a0f6a9752b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2450122

Change-Id: I0b664d67d8b5da4b2982058adef32d3ded804d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 11:46:06 +00:00
Ian Baker
f922e9fa40 Merge "RingtoneManager#setActualDefaultRingtone() open OutputStream of cacheUri with "wt" mode" 2023-02-22 11:42:17 +00:00
SongFerng Wang
a0f6a9752b Merge "Fix the text color in the dark theme" 2023-02-22 10:41:19 +00:00
Robin Lee
5f18f26510 Add self as OWNER for wm/ 
Change-Id: Ice0d48e40345ec65fff5d2d325d9896cbe381098
Test: aosp/2450462
 2023-02-22 10:34:27 +00:00
Chiachang Wang
c9ff47bea2 Merge "Update visibility of a constant for testing" am: 7370ba4f30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2445829

Change-Id: I4a171da6643b0d5ecf8098b441ea31f024a4da30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 06:39:05 +00:00
Chiachang Wang
7370ba4f30 Merge "Update visibility of a constant for testing" 2023-02-22 05:58:02 +00:00
SongFerngWang
74c813fdf2 Fix the text color in the dark theme 
Bug: 265887948
Test: build pass and verified the UI in the dark theme.
Change-Id: I6935bce627e7b28c3a9386c1f52b3953e4d1f5c3
Merged-In: I6935bce627e7b28c3a9386c1f52b3953e4d1f5c3
 2023-02-22 02:13:06 +00:00
Chiachang Wang
e254b772c3 Merge "Have VPN use ESP_IP_VERSION and ESP_ENCAP_TYPE" am: 8c05531a44 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2440293

Change-Id: I06247808faa56f8931e38d6c3b403ee0286af478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 01:34:46 +00:00
Chiachang Wang
8c05531a44 Merge "Have VPN use ESP_IP_VERSION and ESP_ENCAP_TYPE" 2023-02-22 00:47:44 +00:00
Mikhail Naganov
1b7b6dd105 Fix refactoring error in MicrophoneInfo 
A line creating an output array was removed by mistake
during refactoring, add it back.

Bug: 206738075
Test: atest CtsMediaAudioTestCases:AudioRecordTest#testGetActiveMicrophones
Change-Id: I8562a403b27094954d90e97d1298fd5e8cdec843
 2023-02-21 11:57:06 -08:00
Guojing Yuan
4b8f51c396 Merge "Add CDM core test OWNERS file" am: c79f3cde35 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2447442

Change-Id: Ia06061afb6fdebb425b4c280a91e351376015e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-21 18:35:12 +00:00
Diego Vela
b788d592b5 Update ActivityEmbedding Usage 
Update ActivityEmbeddingUsage

Bug: 259592300
Test: build
Change-Id: Ic0e0ffcd576eed31a10d682bb0efdff5d1773b7d
Merged-In: Ic0e0ffcd576eed31a10d682bb0efdff5d1773b7d
(cherry picked from commit 0986205df0)
 2023-02-21 18:03:57 +00:00
Anvesh Renikindi
da047e3a9f Merge "Update ActivityEmbeddingUsage" into stage-aosp-master 2023-02-21 17:48:59 +00:00
Guojing Yuan
c79f3cde35 Merge "Add CDM core test OWNERS file" 2023-02-21 17:20:06 +00:00