Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
636,382 Commits 3 Branches 0 Tags
ecd46961ba4f207392f250be0bfb5dc342fefbe5
Commit Graph

6401 Commits

Author SHA1 Message Date
Ying Xu
8ac1b64744 Merge "Update the RAT string for Carrier WiFi" into sc-dev am: ab77b87f11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13957374

Change-Id: I97b1170e4c3862823b0cb028d16701df941ec55f
 2021-03-23 14:41:35 +00:00
yinxu
87b75509f9 Update the RAT string for Carrier WiFi 
Bug: 175317582
Test: Manual tests
Change-Id: I09afdb3120e5e0e907662ab7db1ce1ce09a551ac
 2021-03-22 16:03:27 -07:00
TreeHugger Robot
e283ebd1af Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-22 14:32:36 +00:00
TreeHugger Robot
ce87fc2b8b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-22 14:13:31 +00:00
Chiachang Wang
8b2e871e08 Merge "Remove hidden onAvailable callback override" into sc-dev am: a95de94fd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13927659

Change-Id: I045c80d66156198747f81392f7a8381314dcfba8
 2021-03-22 13:18:11 +00:00
Bob Badour
1dba67a98a Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev am: de3fb7e9b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13923004

Change-Id: Icfde671b0753b1553e0dbbdc6de4c35d06febeac
 2021-03-22 13:02:52 +00:00
Bill Yi
1effb1ae47 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I37b7d1ad4715f8cd5fbb28e7c0635f9d0e42be97
 2021-03-22 11:37:48 +00:00
Bill Yi
c749b6c168 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8292cbe4a61152d78c71ac065cfc9262c2b745ee
 2021-03-22 10:42:52 +00:00
Chiachang Wang
a95de94fd4 Merge "Remove hidden onAvailable callback override" into sc-dev 2021-03-22 02:44:16 +00:00
Bob Badour
de3fb7e9b3 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev 2021-03-19 23:55:24 +00:00
Quang Luong
f858217802 Merge "Revert "Update min_sdk_versions to match WifiTrackerLib"" into sc-dev am: 406c9fb61c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13930075

Change-Id: I044d02618bc6073b475e60ccca3ee6046119ff62
 2021-03-19 17:22:27 +00:00
Quang Luong
406c9fb61c Merge "Revert "Update min_sdk_versions to match WifiTrackerLib"" into sc-dev 2021-03-19 17:04:58 +00:00
Quang Luong
0c3b94e971 Revert "Update min_sdk_versions to match WifiTrackerLib" 
Revert "Update GoogleWifiTrackerLib min_sdk_version to match Wif..."

Revert "[WifiTrackerLib] Put @hide methods in separate wrapper p..."

Revert "Update TwoPanelSettingsLib min_sdk_version to match Sett..."

Revert "Update BluetoothServices min_sdk_version to match Settin..."

Revert "Update DroidTwoPanelSettingsLib min_sdk_version to match..."

Revert submission 13842044-wifitrackerlib-hideapi

Reason for revert: build breakage
Reverted Changes:
I85b8ed34a:[WifiTrackerLib] Put @hide methods in separate wra...
I891f51aab:Update DroidTwoPanelSettingsLib min_sdk_version to...
If8e82e047:Update GoogleWifiTrackerLib min_sdk_version to mat...
I4529627fb:Update BluetoothServices min_sdk_version to match ...
I87b46a09b:Update TwoPanelSettingsLib min_sdk_version to matc...
I65a3246b4:Update min_sdk_versions to match WifiTrackerLib

Change-Id: I083b764b42e5cf5476b1ec9ed3a9b2d5ed12afc9
 2021-03-19 16:55:23 +00:00
Quang Luong
6f79bf6ba4 Merge "Update min_sdk_versions to match WifiTrackerLib" into sc-dev am: 45abbc309d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13842469

Change-Id: Ie752e7b946aa8a8e1b00b3d6892f86dc119ae433
 2021-03-19 16:24:24 +00:00
Quang Luong
45abbc309d Merge "Update min_sdk_versions to match WifiTrackerLib" into sc-dev 2021-03-19 16:19:15 +00:00
TreeHugger Robot
57f2995da5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-19 15:58:41 +00:00
TreeHugger Robot
21ca6a91a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-19 15:49:48 +00:00
Chiachang Wang
8306c5c5ed Remove hidden onAvailable callback override 
ConnectivityManager will be a part of incoming connectivity
mainline. Settings will no longer to access the hidden usage.
The usage in WifiStatusTracker should only need to do in the
onCapabilitiesChanged but not to refer to a hidden callback.
Replace the usage to remove the hidden dependency.

Bug: 172183305
Test: Verify the behavior works as expected
Change-Id: I1bdc1c88869ebf815117ceccd2b008681e8290c5
 2021-03-19 13:17:09 +00:00
Bob Badour
1bf1c4a556 [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  packages/SettingsLib/TwoTargetPreference/Android.bp
  services/api/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I12b67c8466fbb1973d6b06f40b88d4e1e88e9a91
 2021-03-19 04:22:12 -07:00
Bill Yi
8b3302143d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id8980b30b00984d2cba35f8fb006e7df366ea96a
 2021-03-19 10:13:10 +00:00
Bill Yi
0eeefc92f7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe4b40c3ae2c46ecba200ba4c533592fc54941ec
 2021-03-19 09:44:54 +00:00
tim peng
2117346c65 Merge "Incorrect summary for the carkit device" into sc-dev am: 53241f6144 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13911070

Change-Id: I68d9cd51e11c73e86d831224a94415808285cd44
 2021-03-19 08:25:51 +00:00
tim peng
53241f6144 Merge "Incorrect summary for the carkit device" into sc-dev 2021-03-19 08:02:28 +00:00
Paul Hu
1ca746f686 Merge "Remove hidden LinkProperties methods accesses" am: eed88a705d am: 65e6be618f am: 9c7ea4db8a am: a4f2532601 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645287

Change-Id: Ic8dd9cd1a0e3326f57087c9c6b11c5ee96bb392f
 2021-03-19 07:43:50 +00:00
Paul Hu
a4f2532601 Merge "Remove hidden LinkProperties methods accesses" am: eed88a705d am: 65e6be618f am: 9c7ea4db8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645287

Change-Id: I39ae9cca2d62902084ce50a9520d7a292a3733d7
 2021-03-19 07:28:08 +00:00
Paul Hu
9c7ea4db8a Merge "Remove hidden LinkProperties methods accesses" am: eed88a705d am: 65e6be618f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645287

Change-Id: Ib99ec3f77247d38f7e7c47898aa3e27ad2ed9a93
 2021-03-19 06:44:34 +00:00
Tim Peng
6d62cc7163 Incorrect summary for the carkit device 
-"Problem connecting. Turn the device off & back on" message shows in the BT setting when DUT pair with carkit and SAP connection is established.
-HFP and SAP can not be connected at the same time.

Bug: 182740717
Test: make -j50 RunSettingsLibRoboTests ROBOTEST_FILTER=CachedBluetoothDeviceTest
Change-Id: Ieadbe137c3098c25d527e0db4b7df9267bfde9f7
 2021-03-19 01:18:05 +00:00
Beverly Tai
b6578419b6 Merge "Don't show an app icon for uninitalized user" into sc-dev am: dfa48a9738 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13902468

Change-Id: Ied0726d2e13c2573c280cbe994c22c7645f61bb8
 2021-03-18 16:32:16 +00:00
Beverly Tai
dfa48a9738 Merge "Don't show an app icon for uninitalized user" into sc-dev 2021-03-18 16:20:33 +00:00
Chiachang Wang
ded7e058e9 Remove hidden LinkProperties methods accesses 
This commit resolves the hidden methods accesses for
LinkProperties in Setting libs. Replace them with equivalent
methods.

Bug: 172183305
Test: m
Change-Id: I66592aa9e0e5982c9fae51de3587c1e759f545ef
 2021-03-18 13:46:16 +00:00
Jason Hsu
39ed837f87 Merge "Update HTML description for Color correction" into sc-dev 2021-03-18 04:54:36 +00:00
Treehugger Robot
9d45145878 Merge "Replace hidden CM#isNetworkSupported() usage" am: 976a18e914 am: 3ca15774bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639903

Change-Id: I75ce3f5c1364d7f39262d5e2140b621f9049e8f3
 2021-03-18 03:41:57 +00:00
Ying Xu
3204b1a629 Merge changes I55b21a32,I4188007a into sc-dev am: a8e0f31571 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13878945

Change-Id: I518e93f4cdf0327fc082c965ea5cdd7c84794342
 2021-03-17 22:05:20 +00:00
Ying Xu
a8e0f31571 Merge changes I55b21a32,I4188007a into sc-dev 
* changes:
  Explicitly opt-in to get location data from WifiInfo
  Fix the QS Tile issue
 2021-03-17 21:34:25 +00:00
Beverly
d581430ab8 Don't show an app icon for uninitalized user 
System apps running can post toasts before the app packages have been
initialized by ApplicationsState. If this happens, don't check for the
appEntry, instead automatically hide its icon from the toast.

Test: manual
Fixes: 182605816
Change-Id: I7e764341d049095da19f391ba9c944871584b921
 2021-03-17 13:00:59 -04:00
Chiachang Wang
daaea72fbd Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev am: 11222736c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13896650

Change-Id: I90c5702c9d4df9c29167b6e0e144badd83cec80c
 2021-03-17 15:31:31 +00:00
Chiachang Wang
c6b729eea8 Replace hidden CM#isNetworkSupported() usage 
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settingslib use it to
check if device support telephony service. Use alternative
method to check if device supports such feature.

Bug: 172183305
Test: make RunSettingsLibRoboTests
Change-Id: I713c6410fcf9543d54d9b0057ed7b2ecdab201ee
Merged-In: I713c6410fcf9543d54d9b0057ed7b2ecdab201ee
 2021-03-17 15:23:01 +00:00
Chiachang Wang
11222736c5 Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev 2021-03-17 15:21:17 +00:00
jasonwshsu
7ff9a0c37e Update HTML description for Color correction 
Bug: 181789336
Test: manual
Change-Id: I2a230933ef38a2b963fb4c6baef9d777086f676f
(cherry picked from commit 6c3be24c68)
 2021-03-17 14:54:01 +00:00
Chiachang Wang
104cd7c155 Replace hidden CM#isNetworkSupported() usage 
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settingslib use it to
check if device support telephony service. Use alternative
method to check if device supports such feature.

Bug: 172183305
Test: make RunSettingsLibRoboTests
Change-Id: I713c6410fcf9543d54d9b0057ed7b2ecdab201ee
 2021-03-17 15:15:26 +08:00
Edgar Wang
9878471937 Merge "Create SettingsLibTwoTargetPreference" into sc-dev am: 23ef16b54a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13566525

Change-Id: I66f17094dac18ff26620a0f0cbffd28a55da87a7
 2021-03-17 05:17:00 +00:00
Edgar Wang
23ef16b54a Merge "Create SettingsLibTwoTargetPreference" into sc-dev 2021-03-17 05:08:21 +00:00
Edgar Wang
506c0cfab4 Create SettingsLibTwoTargetPreference 
Bug: 180156703
Test: robotest
Change-Id: I4a9958efa47ac24f88e06c8fdb1c9d0a5542e360
 2021-03-17 01:27:50 +00:00
Jason Hsu
19fdf4ab08 Merge "Update HTML description for Color correction" 2021-03-16 02:48:39 +00:00
yinxu
2ed590c29b Explicitly opt-in to get location data from WifiInfo 
Bug: 182615941
Test: Manual Tests
Change-Id: I55b21a323026af8d83c2f2ba3de47dce17788eb9
 2021-03-15 11:39:38 -07:00
Treehugger Robot
92c9efe4de Merge "Add OWNER to SettingsLib/connectivity and wifi path" am: 6d9f65cd77 am: cdfe10e2ad am: 94b990e103 am: b7b31d0f5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634467

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbd539dae6555aa35903ba921eb6b7dcc78064f6
 2021-03-15 13:28:36 +00:00
Treehugger Robot
b7b31d0f5d Merge "Add OWNER to SettingsLib/connectivity and wifi path" am: 6d9f65cd77 am: cdfe10e2ad am: 94b990e103 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634467

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05111bc9a32c0332ad6e859c5d170f9462ff1eef
 2021-03-15 12:54:32 +00:00
Treehugger Robot
94b990e103 Merge "Add OWNER to SettingsLib/connectivity and wifi path" am: 6d9f65cd77 am: cdfe10e2ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634467

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65c02d700034d209f0b2f19493c22b5d814a0508
 2021-03-15 12:12:13 +00:00
jasonwshsu
6c3be24c68 Update HTML description for Color correction 
Bug: 181789336
Test: manual
Change-Id: I2a230933ef38a2b963fb4c6baef9d777086f676f
 2021-03-15 16:39:01 +08:00
Betty Chang
6b65d80970 Add OWNER to SettingsLib/connectivity and wifi path 
Change-Id: I59a395a8a937cd2b0baa6b5f59524bc17e4f1d9c
 2021-03-15 03:58:57 +00:00