Commit Graph

46286 Commits

Author SHA1 Message Date
Xin Li
0a8e4aebf5 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." 2019-05-17 00:58:08 +00:00
Xin Li
87f090ba57 DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
Bug: 132622481
Change-Id: I3f8a777574eb05716d4ff18e64c9750184de26b6
2019-05-15 16:55:39 -07:00
Xin Li
e6eeb7bd55 DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: I812914052b50070b44ac2e2ba573a7146b6cbb78
2019-05-14 10:08:40 -07:00
Xin Li
601dd7f647 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: d5ce2c2afc -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4eb5c4bbd9a841279826081f8d714d8c24cbf5b
2019-05-09 19:05:15 -07:00
Xin Li
f0acd850fb [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
am: 361819cf69 -s ours
am skip reason: subject contains skip directive

Change-Id: I16b6508bd9ad9c92feee71ebc34cbf65edb866d8
2019-05-09 16:08:44 -07:00
Xin Li
d5ce2c2afc Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:45 +00:00
Xin Li
361819cf69 DO NOT MERGE - Merge Pie Bonito/Sargo into master.
Bug: 131756210
Change-Id: Ica814624161d8d3cc74a2e5bc9311354767ca255
2019-05-09 09:27:05 -07:00
android-build-team Robot
c54ebfa7e3 Snap for 5450365 from 1fb5b5100d to pi-platform-release
Change-Id: I3d469d04b64e6624027ad9e766f0f8c035e6661e
2019-05-07 21:58:21 +00:00
Xiangyu/Malcolm Chen
bb95bb5f8b Merge "Adding new strings needed for Enable MMS toggle."
am: 3c6cb98ec0

Change-Id: I4c011e272fe7610b2751f5f49c0132ee497ff280
2019-05-01 14:58:44 -07:00
Xiangyu/Malcolm Chen
3c6cb98ec0 Merge "Adding new strings needed for Enable MMS toggle." 2019-05-01 20:49:35 +00:00
Malcolm Chen
8b2a07b877 Adding new strings needed for Enable MMS toggle.
Bug: 130222866
Test: build
Change-Id: If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c
Merged-In: If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c
2019-04-29 14:24:28 -07:00
Mark Chien
7b30503dc4 Merge "Ignore the outdated entitlement check"
am: d7885ca73a

Change-Id: If610c3233137562571eeff0b2d73b2bdd946ebd9
2019-04-19 20:26:15 -07:00
Mark Chien
d7885ca73a Merge "Ignore the outdated entitlement check" 2019-04-20 02:05:33 +00:00
Yiwei Zhang
730c10c93e Merge changes from topic "GameDriver2"
am: 44ab00de7f

Change-Id: I4ffdd92469ccd67907a169bead5d1473a5a6777c
2019-04-18 17:40:42 -07:00
Yiwei Zhang
eb5f8b1139 Game Driver: rename GUP to Game Driver
am: 046b9a8ca2

Change-Id: I58e48a8893ad5cac202bf9bf2afd3db120ae23cc
2019-04-18 17:39:38 -07:00
Yiwei Zhang
b168f16bfd Game Driver: Add footer to the dashboard
am: 34986f5ba5

Change-Id: Id046f661896bdd068519fb96524e6ab455229025
2019-04-18 17:38:20 -07:00
Yiwei Zhang
ceb8551cd1 Game Driver: Add SwitchBar to control GUP feature
am: b15cc090d1

Change-Id: Icd1b593294426db2d8ffda3cad926fffb32cd4d5
2019-04-18 17:36:46 -07:00
Yiwei Zhang
c37c07ba99 GUP: Add global switch for all apps
am: 75548c4a33

Change-Id: I12d7ff1e9959eb3e5e88c9f9e9f8bab2d88f7e95
2019-04-18 17:35:09 -07:00
Yiwei Zhang
e506f9d7f5 GUP: Fixed some typos and update some values
am: d0bbbfeeea

Change-Id: I0d23b978d62c2c0eaced50c878e874844d7862db
2019-04-18 17:33:07 -07:00
Yiwei Zhang
f0b7bf7cca GUP: Display a list of Apps and dialogs
am: dc62028e85

Change-Id: I3d13512fda47d401444f665636d83dff2fb23882
2019-04-18 17:30:54 -07:00
Yiwei Zhang
329a5e938e GUP: Add stub UI
am: a2754c515b

Change-Id: Ia9d6d44d106b7dc3b54218921039e9ee03967533
2019-04-18 17:28:33 -07:00
Treehugger Robot
44ab00de7f Merge changes from topic "GameDriver2"
* changes:
  Game Driver: Fix EnableForAllApps switch and test
  Game Driver: rename GUP to Game Driver
  Game Driver: Add footer to the dashboard
  Game Driver: Add SwitchBar to control GUP feature
  GUP: Add global switch for all apps
  GUP: Fixed some typos and update some values
  GUP: Display a list of Apps and dialogs
  GUP: Add stub UI
2019-04-19 00:06:39 +00:00
Yiwei Zhang
9e758e1409 Game Driver: Fix EnableForAllApps switch and test
Bug: 123707483
Bug: 119221883
Test: Build, flash, boot and make RunSettingsRoboTests
Change-Id: Iffbe3355b37763d4fa71b96271c1ba448fb6cdc5
Merged-In: Iffbe3355b37763d4fa71b96271c1ba448fb6cdc5
2019-04-18 13:40:06 -07:00
Yiwei Zhang
046b9a8ca2 Game Driver: rename GUP to Game Driver
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9
Merged-In: Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9
2019-04-18 13:40:04 -07:00
Yiwei Zhang
34986f5ba5 Game Driver: Add footer to the dashboard
This change adds a footer to the current dashboard to show some
descriptions when the whole module is turned off.

Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: I9788d4c64b06deb099a43e8db7eecab20a85f494
Merged-In: I9788d4c64b06deb099a43e8db7eecab20a85f494
2019-04-18 13:39:17 -07:00
Yiwei Zhang
b15cc090d1 Game Driver: Add SwitchBar to control GUP feature
Uncheck the global switch will hide the preference controllers and force
all apps to use system graphics driver. This change also add a content
observer to notify all the preference controllers of settings global
changes.

Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Ice9ded17c759791a3728c552f79881e2215ac081
Merged-In: Ice9ded17c759791a3728c552f79881e2215ac081
2019-04-18 13:39:08 -07:00
Yiwei Zhang
75548c4a33 GUP: Add global switch for all apps
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493
Merged-In: Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493
2019-04-18 13:38:01 -07:00
Yiwei Zhang
d0bbbfeeea GUP: Fixed some typos and update some values
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0
Merged-In: I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0
2019-04-18 13:37:56 -07:00
Yiwei Zhang
dc62028e85 GUP: Display a list of Apps and dialogs
1) Add preference controller for gup dashboard and add list preferences
for each entry of the apps
2) Add gup dashboard page to search index
3) Add comprehensive tests for GupPreferenceController

Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Ide4934c0dd3901532723e77e74663e5a7b639026
Merged-In: Ide4934c0dd3901532723e77e74663e5a7b639026
2019-04-18 13:37:44 -07:00
Colin Cross
2df12ab3bb Merge "Update SettingsRoboTests for truth 0.42"
am: 1e342c5be6

Change-Id: I76e84b28fc62f50e16fe712eb2da234912473652
2019-04-17 16:23:06 -07:00
Colin Cross
1e342c5be6 Merge "Update SettingsRoboTests for truth 0.42" 2019-04-17 23:16:08 +00:00
Colin Cross
56f3f41115 Update SettingsRoboTests for truth 0.42
SubjectFactory has been replaced with Subject.Factory.

Subject.getDisplaySubject has been replaced with
actualCustomStringRepresentation.

Bug: 130435731
Test: m checkbuild
Change-Id: I2799badfb79432ec70cb928b77294d6940cfc019
Merged-In: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
2019-04-17 14:37:25 -07:00
Peiyong Lin
292904293a Merge changes from topic "GameDriver"
am: 1d518f422b

Change-Id: I6e87de41a3ccb3e06dbbca44c797a4a16e123087
2019-04-17 14:05:24 -07:00
Peiyong Lin
add03324df Add developer option to opt-in updatable graphics driver.
am: 5a92a74f23

Change-Id: Ib73af7ac9e9e4e33d8a5eca24a5b76f60af77132
2019-04-17 14:04:05 -07:00
Treehugger Robot
1d518f422b Merge changes from topic "GameDriver"
* changes:
  Rename updatable graphics driver to Game Update Package.
  Add developer option to opt-in updatable graphics driver.
2019-04-17 19:28:15 +00:00
Yiwei Zhang
a2754c515b GUP: Add stub UI
Bug: 119221883
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GupDashboardTest

Change-Id: I1f7cc66790e1d1e1de5113e28a055ec5d1679013
Merged-In: I1f7cc66790e1d1e1de5113e28a055ec5d1679013
2019-04-16 23:37:51 -07:00
Peiyong Lin
c528032c2e Rename updatable graphics driver to Game Update Package.
We have rebranded this project to Game Update Package, and GUP for short.

BUG: 119221883
Test: Build, flash and boot. Verify by going to developer options.
Change-Id: Ibc0814b6cd1e9bee991624c925456bc330fd93c6
Merged-In: Ibc0814b6cd1e9bee991624c925456bc330fd93c6
2019-04-16 23:37:44 -07:00
Peiyong Lin
5a92a74f23 Add developer option to opt-in updatable graphics driver.
To facilitate developers to develop their applications against the updated
graphics driver, we provide a developer option to select one application to
opt-in. The selected application will always use updated graphics driver by
default.

BUG: 119221883
Test: Build, flash, boot, select a game and verify with prototype.
Change-Id: I8c3905fd5c1cbfb3ce12e589b48f57396c7776e3
Merged-In: I8c3905fd5c1cbfb3ce12e589b48f57396c7776e3
2019-04-16 18:49:19 -07:00
Jordan Liu
1636344325 Merge "Do not reuse phonestatelistener"
am: c99fddfe75

Change-Id: I52e311da7ae9a9477b74fc25f6bb122935e14582
2019-04-15 12:37:48 -07:00
Jordan Liu
c99fddfe75 Merge "Do not reuse phonestatelistener" 2019-04-15 19:27:06 +00:00
markchien
f9f0d11782 Ignore the outdated entitlement check
Don't run entitlement if the request is base on outdated subId.

Bug: 129751453
Test: -build, flash, boot
      -atest TetherServiceTest
      -manual test with carrier SIM

Change-Id: Id3157df1a5758f8c72acbc45c9fefd2215c87395
2019-04-15 15:54:52 +08:00
Bill Yi
ad53ebb2da [automerger skipped] Merge "Import translations. DO NOT MERGE"
am: bea1ed8666 -s ours
am skip reason: subject contains skip directive

Change-Id: Iec39c3c20fdb63b908c40ca9273a17e1baef8612
2019-04-13 04:57:24 -07:00
Treehugger Robot
bea1ed8666 Merge "Import translations. DO NOT MERGE" 2019-04-13 11:45:22 +00:00
Bill Yi
691efb9036 Import translations. DO NOT MERGE
Change-Id: I3445f31f0d5fb57f93a26c58cc8686a453bb8c46
Auto-generated-cl: translation import
2019-04-13 03:41:31 -07:00
Jordan Liu
e431f6337f Do not reuse phonestatelistener
Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.

Fixes: 129989656
Test: manual
Change-Id: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I9d6631da628351511e285afeb5b6d4331aaab7e5
Merged-In: I7630e74a9361093d8cbe72fa72c14aaaab9fcc17
2019-04-12 17:26:10 +00:00
Brad Ebinger
c91d33798b Merge "Fix issue that user can't edit WFC mode for SIM2"
am: d2727d5d9f

Change-Id: I1bbbe7efe7f057dfcf55f9685f2b10ebd94e3f38
2019-04-10 16:17:17 -07:00
Brad Ebinger
d2727d5d9f Merge "Fix issue that user can't edit WFC mode for SIM2" 2019-04-10 21:57:56 +00:00
Amit Mahajan
afa7f96768 Merge "Treat mcx apn type as not wild-cardable."
am: 61841ba690

Change-Id: I422e025bcacbae3f0c52b71f3e21d3881a42d553
2019-04-09 17:32:34 -07:00
Amit Mahajan
61841ba690 Merge "Treat mcx apn type as not wild-cardable." 2019-04-10 00:08:43 +00:00
Amit Mahajan
ac0244e572 Treat mcx apn type as not wild-cardable.
Test: manual
Bug: 130167974
Merged-in: Ic3e643646491e5a187505fd54ca767ad91e285f5
Change-Id: Ic3e643646491e5a187505fd54ca767ad91e285f5
(cherry picked from commit 2fa0b7ed85)
2019-04-09 14:52:48 -07:00