Commit Graph

55804 Commits

Author SHA1 Message Date
Treehugger Robot
e29ca94af4 Merge "[Mainline] Remove unused UiccController object" 2019-12-25 02:54:20 +00:00
changbetty
b7c8404317 [Mainline] Remove unused UiccController object
Bug: 146842199
Test: make
Change-Id: I35f86ee24c0db2599924fb470537b860c9d08390
2019-12-25 02:50:01 +00:00
Automerger Merge Worker
7f659062a5 Merge "[Setting] Use @SystemApi to replace the hidden api" am: e74208c831 am: 7ec7514f1e
Change-Id: I9779621d46ba83975bcd552b7b36939d934110bf
2019-12-24 11:15:42 +00:00
Zoey Chen
7ec7514f1e Merge "[Setting] Use @SystemApi to replace the hidden api"
am: e74208c831

Change-Id: If091c3ba75733da4cb8c509409c070de7e5c625d
2019-12-24 03:02:23 -08:00
Zoey Chen
e74208c831 Merge "[Setting] Use @SystemApi to replace the hidden api" 2019-12-24 10:58:34 +00:00
Automerger Merge Worker
857267b1e8 Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs" am: 6bba42fb40 am: 27c52d5e76
Change-Id: I12080d93b39b990083f3ac795b7e4ae42ffcbe8d
2019-12-24 09:14:23 +00:00
SongFerng Wang
27c52d5e76 Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs"
am: 6bba42fb40

Change-Id: I394bc5a8d7d2463244a87ff7defab39c4fd664d5
2019-12-24 01:01:53 -08:00
SongFerng Wang
6bba42fb40 Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs" 2019-12-24 08:59:48 +00:00
android-build-team Robot
0e5a27d4d4 Snap for 6095135 from 462eac2c56 to qt-qpr2-release
Change-Id: Iecb14185bbe017e6102faacb22be8bcf9b011b48
2019-12-24 02:08:40 +00:00
Automerger Merge Worker
9695d6f4d6 [automerger skipped] Import translations. DO NOT MERGE am: 462eac2c56 -s ours
am skip reason: subject contains skip directive

Change-Id: Iae76ed3482f427546053de7a57fcb12806c360f1
2019-12-23 16:39:50 +00:00
Bill Yi
462eac2c56 Import translations. DO NOT MERGE
Change-Id: I9250823846a5425a974ec9bc49824284a7e79371
Auto-generated-cl: translation import
2019-12-23 02:11:24 -08:00
Automerger Merge Worker
f5b6c700fc Merge "[Settings] Replace Robolectric#setupActivity()" am: 6aee4f9548 am: 69f67d996b
Change-Id: I2b2622c16d23347b8d0a709ea7e1b681e6be7480
2019-12-23 08:16:16 +00:00
Bonian Chen
69f67d996b Merge "[Settings] Replace Robolectric#setupActivity()"
am: 6aee4f9548

Change-Id: I4113d68bb4363dc5c847ab802c0cee16d726e444
2019-12-23 00:02:22 -08:00
Bonian Chen
67f7ab3f2b [Settings] Replace TelephonyManager#from()
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EuiccPreferenceControllerTest
Change-Id: I8f6e8bc57c20782540f8b26bdeb163d881e70a2e
2019-12-23 15:44:52 +08:00
Bonian Chen
6aee4f9548 Merge "[Settings] Replace Robolectric#setupActivity()" 2019-12-23 07:38:44 +00:00
Automerger Merge Worker
4af546197b Merge "[Settings] Add owners to support network part" am: 661f006bb2 am: 0ed7376449
Change-Id: I480f8f481e200c3c551e621ba52e435c4fb0cf5b
2019-12-23 06:22:32 +00:00
Automerger Merge Worker
0988f8cfec Merge "Retrieve EID from each card" am: 2f5ad9cb4d am: d34e17143f
Change-Id: Iee9c974eef13599eebc4dfd82f7fbc5f10e7ca58
2019-12-23 06:21:54 +00:00
SongFerngWang
d6bc6dee08 Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs
- telephonymanager set subid by createForSubscriptionId
  -getDataNetworkType(I)
  -getVoiceNetworkType(I)
  -getSimSerialNumber(I)
  -getServiceStateForSubscriber(I)
- copy getNetworkTypeName() to SimStatusDialogController

Bug: 143998492
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER\
      =SimStatusDialogControllerTest

Change-Id: Ieb8547496a4b0da7332abd227056f9b786c7ef6a
2019-12-23 14:12:56 +08:00
Bonian Chen
0ed7376449 Merge "[Settings] Add owners to support network part"
am: 661f006bb2

Change-Id: I716f8391987f4d1feaf5e2df2d176d82236c0af9
2019-12-22 22:09:28 -08:00
Bonian Chen
d34e17143f Merge "Retrieve EID from each card"
am: 2f5ad9cb4d

Change-Id: I0a9f6ac304af1be0960adb16d5125de43c9ad4b0
2019-12-22 22:06:32 -08:00
Bonian Chen
661f006bb2 Merge "[Settings] Add owners to support network part" 2019-12-23 05:57:59 +00:00
Bonian Chen
2f5ad9cb4d Merge "Retrieve EID from each card" 2019-12-23 05:53:14 +00:00
Bonian Chen
a0b942a6f4 [Settings] Add owners to support network part
Add more owners to support network part.

Bug: none
Test: none
Change-Id: I3fa0a72e75aace65887c461204fd9a33bd8fee13
Merged-In: Ic2820bc113bc26fc0d162c42c7925477177127ae
2019-12-23 12:40:07 +08:00
Automerger Merge Worker
4b7659a1ef Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" am: 990b0527aa am: c9e4e0b881
Change-Id: I8ea4f4ec0781ebb28b3aeb0681123d9d1e8ba69b
2019-12-23 03:50:58 +00:00
Zoey Chen
c9e4e0b881 Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API"
am: 990b0527aa

Change-Id: I04c6d51db223bbdbcb18007e77c75103aed150ba
2019-12-22 19:35:11 -08:00
Zoey Chen
990b0527aa Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" 2019-12-23 03:33:35 +00:00
Bonian Chen
6435164abf [Settings] Replace Robolectric#setupActivity()
Avoid from accessing Robolectric#setupActivity().

Bug: 140707056
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EuiccPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ApnPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I8552b181d2dc1c9a5d8aeb0b7e79bbec7252f67e
2019-12-23 03:08:25 +00:00
Automerger Merge Worker
737783d5e4 Merge "[Settings] Replace TelephonyManager#from()" am: 19cebd9eca am: fb72a1094f
Change-Id: Ib6869f626d9cb5f085ab77c150e245dec904b6fb
2019-12-23 02:51:48 +00:00
Bonian Chen
fb72a1094f Merge "[Settings] Replace TelephonyManager#from()"
am: 19cebd9eca

Change-Id: Id5539c4177dbf5dec92add4e1150d6beea4907e5
2019-12-22 18:42:08 -08:00
Bonian Chen
19cebd9eca Merge "[Settings] Replace TelephonyManager#from()" 2019-12-23 02:40:01 +00:00
Bonian Chen
228dd34a8a [Settings] Replace TelephonyManager#from()
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaListPreferenceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSubscriptionPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSystemSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AutoSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=OpenNetworkSelectPagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkSettingsTest
Change-Id: If78ad37d4795d615b6f8db2f5687a28792a6764f
2019-12-23 01:00:38 +00:00
android-build-team Robot
c4825bade0 Snap for 6091872 from 1cdbed55f9 to qt-qpr2-release
Change-Id: I928b5543f58d494775a671a84a495eb6914c5437
2019-12-22 00:15:21 +00:00
Automerger Merge Worker
c547fc78c7 Merge "Create some strings for RTT setting" into qt-qpr1-dev am: 1cdbed55f9
Change-Id: I8ddf92c23c00c7b2958dbefdf5483e2b609e92c3
2019-12-21 02:34:00 +00:00
TreeHugger Robot
1cdbed55f9 Merge "Create some strings for RTT setting" into qt-qpr1-dev 2019-12-21 02:20:47 +00:00
android-build-team Robot
e45cd6bcb4 Snap for 6091187 from 12510978c3 to qt-qpr2-release
Change-Id: I0953abc899ef41afae7da98eda357b6397c1f111
2019-12-21 02:18:07 +00:00
Automerger Merge Worker
925e9771ea Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev am: 12510978c3
Change-Id: I0808583341d6f2a867dfa47cf08e7f529e3b0571
2019-12-20 18:25:50 +00:00
TreeHugger Robot
12510978c3 Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev 2019-12-20 18:11:29 +00:00
Tsung-Mao Fang
0f7b65b512 Create some strings for RTT setting
Test: Rebuild
Bug: 146540478
Change-Id: I26f218caba46273796e52c244c9f022742f0bdeb
Merged-In: I26f218caba46273796e52c244c9f022742f0bdeb
2019-12-20 16:03:27 +00:00
Automerger Merge Worker
17bc83209f Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev am: bc96cf54cd
Change-Id: I9f59dac9b64f2cb0acf31448c10cb0ef5c04da62
2019-12-20 15:35:13 +00:00
TreeHugger Robot
bc96cf54cd Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev 2019-12-20 15:23:53 +00:00
Automerger Merge Worker
4b6beab35e Remove permission bar chart in Privacy setting am: 8e58e2c7a5
Change-Id: Id55e0078ce0eccc85a0ef15706ba07b26da5c3ab
2019-12-20 10:31:03 +00:00
Sunny Shao
5f42f2f7a7 Update the behavior of the Dark theme slice
- Dark theme slice disappear when battery saver is ON.

Bug: 146149658
Fixes: 142476879
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I071014d7f0658db2098e353717afda905f162ecd
2019-12-20 13:25:49 +08:00
Automerger Merge Worker
36eb9829d5 Merge "Use floats for face enrollment dimensions" am: 59baff6ef9 am: fd493b221a
Change-Id: Ia4ac6e428666fb82f39e6b43620623e141f716c0
2019-12-20 03:18:56 +00:00
Ilya Matyukhin
fd493b221a Merge "Use floats for face enrollment dimensions"
am: 59baff6ef9

Change-Id: I36f7d8bb13e6eb14c76d0a87dcb1db1a48819c17
2019-12-19 19:01:55 -08:00
Treehugger Robot
59baff6ef9 Merge "Use floats for face enrollment dimensions" 2019-12-20 02:35:40 +00:00
Ilya Matyukhin
ad1b76ce3b Use floats for face enrollment dimensions
Test: compiles and runs correctly on a device
Change-Id: I64cb905b06aa2ca2b0703d83ed9a495c7a85cf94
2019-12-19 17:21:04 -08:00
Automerger Merge Worker
d21a3207ef Merge "Add 5G RAT into Bearer field." am: 5f6a4b1dae am: 3350d4d05d
Change-Id: If6bb822fa55a0c477172348ea7dc10112c3b36df
2019-12-19 12:24:22 +00:00
Daniel Huang
3350d4d05d Merge "Add 5G RAT into Bearer field."
am: 5f6a4b1dae

Change-Id: I1921fa9611b2222228667bd55e6ac4df5b19a83a
2019-12-19 04:08:08 -08:00
zoey chen
d7eb8113c7 [Settings] Remove usage of TelephonyManager getDefault() hidden API
Bug: 146537234
Test: make
Change-Id: I818848b0ae323efe8b890cde9d9819d9a606f96d
Mergde-In: I818848b0ae323efe8b890cde9d9819d9a606f96d
2019-12-19 19:45:59 +08:00
Daniel Huang
5f6a4b1dae Merge "Add 5G RAT into Bearer field." 2019-12-19 11:24:41 +00:00