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

5035 Commits

Author SHA1 Message Date
Beverly Tai
1f43e2d079 Merge "Fix talkback ordering of QS zen duration dialog" into rvc-dev am: 41eb96833f am: 58d5212ec1 
Change-Id: I7d2bce49bcde086cce1fec2141f6da6c7a699c49
 2020-04-21 19:18:42 +00:00
Beverly Tai
58d5212ec1 Merge "Fix talkback ordering of QS zen duration dialog" into rvc-dev am: 41eb96833f 
Change-Id: Ic23455801fc67f3216c1c5573f55dd006856b499
 2020-04-21 19:07:34 +00:00
Beverly Tai
41eb96833f Merge "Fix talkback ordering of QS zen duration dialog" into rvc-dev 2020-04-21 19:00:27 +00:00
Fabian Kozynski
07e494d310 Merge "Remove dependency on connectivity sticky broadcasts" into rvc-dev am: 54ba50a500 am: 7e2b3ed4aa 
Change-Id: I728dbb89295591c816f6e58ee92f37896194d322
 2020-04-21 13:43:58 +00:00
Fabian Kozynski
7e2b3ed4aa Merge "Remove dependency on connectivity sticky broadcasts" into rvc-dev am: 54ba50a500 
Change-Id: I8be42400615800be1f3a6b784398f958362954ee
 2020-04-21 13:29:04 +00:00
Fabian Kozynski
54ba50a500 Merge "Remove dependency on connectivity sticky broadcasts" into rvc-dev 2020-04-21 13:13:10 +00:00
TreeHugger Robot
541913bf63 Merge "Extend the MediaDeviceType to support more media device" into rvc-dev am: 08348dead8 
Change-Id: I6f153e103b3fe8130014f375e1169e5150239bfb
 2020-04-21 11:13:35 +00:00
TreeHugger Robot
21e6216195 Merge "Extend the MediaDeviceType to support more media device" into rvc-dev am: 08348dead8 
Change-Id: I198d63a643acede1ee56136c73717308e50a3862
 2020-04-21 02:56:02 +00:00
TreeHugger Robot
08348dead8 Merge "Extend the MediaDeviceType to support more media device" into rvc-dev 2020-04-21 02:47:26 +00:00
Beverly
1aea297c97 Fix talkback ordering of QS zen duration dialog 
Fixes: 154522736
Test: manual
Change-Id: I1ba9da5adeb36ae3a99b044d164288b0f744165d
 2020-04-20 15:05:16 -04:00
Bill Yi
3d4fdd002c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ie764f4d26ae105d9d3a2599bb7d2eb9a1db3c4c3
 2020-04-19 14:53:16 -07:00
Bill Yi
991c3d71bb Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Icce22ebd61f85e00df458a5ffdce42359f35bdba
 2020-04-19 00:55:09 -07:00
hughchen
9a36f80bb9 Extend the MediaDeviceType to support more media device 
Bug: 152633051
Test: make -j42 RunSettingsLibRoboTests
Change-Id: I87b233b25a4ca3758a26c712629b38532e54267a
 2020-04-17 18:09:48 +08:00
Fabian Kozynski
b00c70bc80 Remove dependency on connectivity sticky broadcasts 
This removes the dependency on the following Sticky broadcasts:
* ConnectivityManager.CONNECTIVITY_ACTION
* ConnectivityManager.INET_CONDITION_ACTION
* TelephonyIntents.ACTION_SIM_STATE_CHANGED
* TelephonyIntents.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED
* WifiManager.NETWORK_STATE_CHANGED_ACTION
* WifiManager.WIFI_STATE_CHANGED_ACTION

In general, we fetch the state to populate data.

Also, fixed some bubbles tests that were creating KeyguardUpdateMonitor
down the line.

Test: atest SystemUITests
Bug: 151641451

Change-Id: Ib4b1fba6a09766565cd21f96453bd2d056f74f70
 2020-04-16 16:45:58 -04:00
Rubin Xu
86466e49d8 Merge "Improve work profile unification flow" into rvc-dev am: a042c8afd3 
Change-Id: I8e5f994e91e705beb4e5998e9fff7f391aea1ba1
 2020-04-15 17:25:43 +00:00
Rubin Xu
25c8ff5dea Merge "Improve work profile unification flow" into rvc-dev am: a042c8afd3 
Change-Id: I88df1bde45cf2234e304c336dbb6ecbd65ab96e0
 2020-04-15 17:25:30 +00:00
Rubin Xu
a042c8afd3 Merge "Improve work profile unification flow" into rvc-dev 2020-04-15 11:18:06 +00:00
TreeHugger Robot
b3ec09a33a Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-14 16:30:08 +00:00
TreeHugger Robot
c85b59ce70 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-14 16:17:50 +00:00
TreeHugger Robot
87246bae8e Merge "Return empty array when BluetoothAdapter is null" into rvc-dev am: 635c9bcb04 
Change-Id: If91e39ca35e962c8fdce416f880b0a267b3cb934
 2020-04-14 06:46:59 +00:00
TreeHugger Robot
8c17f68433 Merge "Return empty array when BluetoothAdapter is null" into rvc-dev am: 635c9bcb04 
Change-Id: I549485bf66a38370dd9f8dfba7a30b3fd3c35413
 2020-04-14 06:45:35 +00:00
hughchen
be5140048a Return empty array when BluetoothAdapter is null 
BluetoothAdapter will be null in some platform device, because they
don't have bluetooth feature. This CL add null check to avoid null
point exception on non-bluetooth feature platform device.

Bug: 152647633
Test: make -j42 RunSettingsLibRoboTests
Change-Id: Iba7f41796bd22163ab55a7f9ff4f44df6513754e
 2020-04-14 11:50:55 +08:00
Bill Yi
0cb79869d5 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Idc5b671c85c6749bdc6411ada1cc9781e355f0fa
 2020-04-13 19:47:42 -07:00
Bill Yi
924109813c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ife526f41eb08a57f3571f3f1138bf87204f535cc
 2020-04-13 19:17:55 -07:00
Bill Yi
14c43c7180 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Id78bfa0e9b35b6f420060ef30d03b557f7c8d342
 2020-04-13 18:17:59 -07:00
Bill Yi
e91ce88aa1 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I83c2cd3b60b3750e8adb69a09f4cca58683f783b
 2020-04-11 23:21:14 -07:00
TreeHugger Robot
f7a38c515c Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-10 23:01:32 +00:00
Bill Yi
e7430aeeaf Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ia01315d79d93f486f92131fd4f8dea54acb294e9
 2020-04-10 11:07:39 -07:00
Bill Yi
9e6015d106 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ia03c1b2b831289bcc128878e0296c40faa03f1ce
 2020-04-10 10:37:57 -07:00
TreeHugger Robot
8ce8532910 Merge "Add an interface in SettingsInjector to log metrics" into rvc-dev am: 4e2d66ed6c 
Change-Id: Ied90f32eb13fdd6ec5f319eee719af6a77dc5262
 2020-04-10 13:06:21 +00:00
TreeHugger Robot
83eb812801 Merge "Add an interface in SettingsInjector to log metrics" into rvc-dev am: 4e2d66ed6c 
Change-Id: Iba5f60e146b8b475841caf23891d0cae12e47297
 2020-04-10 12:57:10 +00:00
TreeHugger Robot
4e2d66ed6c Merge "Add an interface in SettingsInjector to log metrics" into rvc-dev 2020-04-10 12:55:08 +00:00
Bonian Chen
2046332862 Merge "[Settings] Data usage for each subscription" into rvc-dev am: eca8cf5166 
Change-Id: Ic30ba6561e3a127ecd806d9d391b6220fa757bb8
 2020-04-10 08:32:34 +00:00
Bonian Chen
ba5dbea8dd Merge "[Settings] Data usage for each subscription" into rvc-dev am: eca8cf5166 
Change-Id: I2b3025ed7e988ce73883d18b71b223ec3f9658cf
 2020-04-10 08:32:27 +00:00
Bonian Chen
eca8cf5166 Merge "[Settings] Data usage for each subscription" into rvc-dev 2020-04-10 08:30:07 +00:00
Bonian Chen
3ff2708e80 [Settings] Data usage for each subscription 
1. Data usage should be displayed for different subscription.
2. Data usage could support displaying information for disabled SIM

Bug: 151751844
Test: manual
Change-Id: Ie79e9968989c40c9be00dd3004a6a5a2eb2fa029
 2020-04-10 13:42:20 +08:00
Oscar Shu
d2057e7a8f Merge "Add Strings for enhanced MAC randomization dev option" into rvc-dev am: c69c66cae7 
Change-Id: I8962d2d340c04baa3db67c196fb151b404f022eb
 2020-04-09 17:57:02 +00:00
Oscar Shu
1e90497241 Merge "Add Strings for enhanced MAC randomization dev option" into rvc-dev am: c69c66cae7 
Change-Id: I51888795e51a3b943d6c34266d5cf22472762d2e
 2020-04-09 17:53:13 +00:00
Oscar Shu
c69c66cae7 Merge "Add Strings for enhanced MAC randomization dev option" into rvc-dev 2020-04-09 17:50:58 +00:00
xshu
dc958c946b Add Strings for enhanced MAC randomization dev option 
Bug: 151983183
Test: compile
Change-Id: I4296718832d43ac3058b20c9d489c221833fd107
 2020-04-08 17:05:30 -07:00
Goven Liu
c66b3b2e68 Merge "[Wi-Fi] Use getUriHelpString() result to judge if show the Openroaming help button." into rvc-dev am: bbdfb53c26 
Change-Id: Iaa39b40062934123a91a71aa45f83fcb99b7743b
 2020-04-08 22:42:34 +00:00
Goven Liu
7e36e69fc1 Merge "[Wi-Fi] Use getUriHelpString() result to judge if show the Openroaming help button." into rvc-dev am: bbdfb53c26 
Change-Id: Id48b0b3cd24ef9cf8e8255c9e3b3443dfcb8635b
 2020-04-08 22:42:28 +00:00
Goven Liu
bbdfb53c26 Merge "[Wi-Fi] Use getUriHelpString() result to judge if show the Openroaming help button." into rvc-dev 2020-04-08 22:37:35 +00:00
Rubin Xu
de633f32ea Improve work profile unification flow 
Expose internal API to check if the user's password
will be sufficient after profile unification. Also
expose some other helper methods and refactor
DevicePolicyManagerService to unify a few similar
methods that gather admins from user and its profiles.

Bug: 148630506
Fix: 149682344
Test: atest com.android.server.locksettings
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Change-Id: Ic647c14d5bab7e7337185bc40b1368e42c65f738
 2020-04-08 14:43:26 +01:00
Joshua Duong
f4a20718be Merge "[adbwifi] Fix case on pairing QR code description." into rvc-dev am: 53c55f8260 
Change-Id: Ib7160248f94468bd9b871b705255c47889fae2ef
 2020-04-07 18:09:00 +00:00
Joshua Duong
fe0842c287 Merge "[adbwifi] Fix case on pairing QR code description." into rvc-dev am: 53c55f8260 
Change-Id: I3b10b3f97888be261a8fc90d7d5005eec805e2e8
 2020-04-07 18:08:49 +00:00
Joshua Duong
53c55f8260 Merge "[adbwifi] Fix case on pairing QR code description." into rvc-dev 2020-04-07 18:07:16 +00:00
Joshua Duong
e5ee010abc Merge "[adbwifi] Fix adbwifi string case." into rvc-dev am: 002ed644a2 
Change-Id: I0b06760bdafe7a83233fc6fa47b10c9e4e5ce0c9
 2020-04-07 16:00:34 +00:00
Joshua Duong
e880f50108 Merge "[adbwifi] Fix adbwifi string case." into rvc-dev am: 002ed644a2 
Change-Id: I95fb1408bee3b213f30c7f8e966dbac1a43f9c83
 2020-04-07 15:59:45 +00:00
Joshua Duong
002ed644a2 Merge "[adbwifi] Fix adbwifi string case." into rvc-dev 2020-04-07 15:54:28 +00:00