PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,573 Commits 1 Branch 0 Tags
b058ba1eb1bf26c8ac1cbf092ea320b07aa9554c
Commit Graph

28573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
7d231e354b Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f 
am: 446e5a536e

* commit '446e5a536edeef02fa976898b2eca85b22296509':

Change-Id: I448140791a788716893324ebae10adbead984f79
 2016-05-13 19:00:20 +00:00
Android Build Merger (Role)
b4e61334ff Merge "Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f am: 446e5a536e" into nyc-mr1-dev-plus-aosp 2016-05-13 18:59:43 +00:00
Makoto Onuki
dc3bb2798a Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f 
am: f4ffd6daff

* commit 'f4ffd6daff1a626d196e30cdebcbf913f936714e':
  ShortcutManager: Remove developer option from NYC

Change-Id: I7689577ee57a58d1abdb4690c453f6a9cadfa251
 2016-05-13 18:59:31 +00:00
Makoto Onuki
feea1622af Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f 
am: 446e5a536e

* commit '446e5a536edeef02fa976898b2eca85b22296509':
  ShortcutManager: Remove developer option from NYC

Change-Id: Iecf0fdd286c2154844075b01dbc622ae52fe7c6e
 2016-05-13 18:59:30 +00:00
Makoto Onuki
f4ffd6daff Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev 
am: a23cd4614f

* commit 'a23cd4614f0341051e85c3dbdb7766d09c089947':
  ShortcutManager: Remove developer option from NYC

Change-Id: Ie49323be5bb7f8b5e258ecb40382463e3cbb847b
 2016-05-13 18:57:00 +00:00
Makoto Onuki
446e5a536e Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev 
am: a23cd4614f

* commit 'a23cd4614f0341051e85c3dbdb7766d09c089947':
  ShortcutManager: Remove developer option from NYC

Change-Id: Icd507fcaba578122e50f4fc86e53bd65b4cac1fb
 2016-05-13 18:57:00 +00:00
Makoto Onuki
a23cd4614f Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev 2016-05-13 18:51:41 +00:00
Julia Reynolds
a5371ae351 Merge "Don\'t crash on invalid numbers." into nyc-dev am: 5c401966a3 am: 6c12a6723c 
am: 1c59860a81

* commit '1c59860a816f8db920ba6fa7bd2a8a6ef36ca9b6':

Change-Id: Iffb2887cab6021b010a9ce4fefae6a2ca35ec1d6
 2016-05-13 18:30:33 +00:00
Julia Reynolds
f9535fb4b5 Merge "Don\'t crash on invalid numbers." into nyc-dev am: 5c401966a3 am: 54408a74fa 
am: d7a6287f9e

* commit 'd7a6287f9e5d50766e395ba26d5bdf578c11e8e8':
  Don't crash on invalid numbers.

Change-Id: Icc89cd6ad11fa8a66d1a9bb1c7e2f4454dc3223e
 2016-05-13 18:30:32 +00:00
Daniel Nishi
15bea421f4 Merge "Entries in the Deletion Helper should be default unchecked." into nyc-mr1-dev am: 4924839515 
am: e197dfa1fc

* commit 'e197dfa1fc7701bd28ce9be08332cca66684e329':
  Entries in the Deletion Helper should be default unchecked.

Change-Id: I9c752e88c3821523c7b5319f3239fc49f047e027
 2016-05-13 18:30:31 +00:00
Julia Reynolds
1c59860a81 Merge "Don\'t crash on invalid numbers." into nyc-dev am: 5c401966a3 
am: 6c12a6723c

* commit '6c12a6723c5de959dacb409288d20ba4f8ed9893':

Change-Id: I2217b28cb6572a37745043f50e95024dd93f1adb
 2016-05-13 18:25:04 +00:00
Julia Reynolds
d7a6287f9e Merge "Don\'t crash on invalid numbers." into nyc-dev am: 5c401966a3 
am: 54408a74fa

* commit '54408a74fa7988a66dc5f68704a2751c23485c0e':
  Don't crash on invalid numbers.

Change-Id: Idbcf00b60beaf13d5d023832ea9a6c9c0a9debbe
 2016-05-13 18:24:22 +00:00
Daniel Nishi
e197dfa1fc Merge "Entries in the Deletion Helper should be default unchecked." into nyc-mr1-dev 
am: 4924839515

* commit '4924839515811deaff1b0a758101f4db47a77683':
  Entries in the Deletion Helper should be default unchecked.

Change-Id: Iaa1bb02433378e3ad9ec0b1029566fc113d8fb14
 2016-05-13 18:24:21 +00:00
Julia Reynolds
6c12a6723c Merge "Don\'t crash on invalid numbers." into nyc-dev 
am: 5c401966a3

* commit '5c401966a3106a223eadabb1fbb156160fdd5222':
  Don't crash on invalid numbers.

Change-Id: If4ce5adec9f3297cf45d8a4f3378ed89c8518bef
 2016-05-13 18:22:25 +00:00
Julia Reynolds
54408a74fa Merge "Don\'t crash on invalid numbers." into nyc-dev 
am: 5c401966a3

* commit '5c401966a3106a223eadabb1fbb156160fdd5222':
  Don't crash on invalid numbers.

Change-Id: Ia622b5a3cb31a6ad0a9aebdb1a3cff28c6d4eb04
 2016-05-13 18:22:18 +00:00
Daniel Nishi
4924839515 Merge "Entries in the Deletion Helper should be default unchecked." into nyc-mr1-dev 2016-05-13 18:15:28 +00:00
Julia Reynolds
5c401966a3 Merge "Don't crash on invalid numbers." into nyc-dev 2016-05-13 18:14:59 +00:00
Julia Reynolds
b9cad485af Don't crash on invalid numbers. 
Change-Id: I5c1bff5733c5db5f411c2827177b0c1efa1e120e
Fixes: 28756890
 2016-05-13 14:01:40 -04:00
Felipe Leme
41dffe632f Merge "Merge "Fixed calls to update() when configuration changed." into nyc-dev am: f4f2211b13 am: 312ecda0ec" into nyc-mr1-dev-plus-aosp 
am: 1e1a082e73

* commit '1e1a082e73e586d075c0684ed43381702f64242f':

Change-Id: I57297101a89213b23c0866b019943099c2af4041
 2016-05-13 17:49:57 +00:00
Felipe Leme
56ef787183 Merge "Fixed calls to update() when configuration changed." into nyc-dev am: f4f2211b13 am: 23c69bb59f 
am: 7e8863479e

* commit '7e8863479eff2c72d9ef495220ccf75dc4077bcf':
  Fixed calls to update() when configuration changed.

Change-Id: Id942919e17543b00169ffa22878f1d6fbf768be7
 2016-05-13 17:49:57 +00:00
Android Build Merger (Role)
1e1a082e73 Merge "Merge "Fixed calls to update() when configuration changed." into nyc-dev am: f4f2211b13 am: 312ecda0ec" into nyc-mr1-dev-plus-aosp 2016-05-13 17:47:25 +00:00
Felipe Leme
c9c30d97ee Merge "Fixed calls to update() when configuration changed." into nyc-dev am: f4f2211b13 
am: 312ecda0ec

* commit '312ecda0ec986635cd88eeec6cc4c5e231ed3d70':
  Fixed calls to update() when configuration changed.

Change-Id: I1d9dae63d0d8a43386c5104f0f7e964c107d3996
 2016-05-13 17:47:17 +00:00
Felipe Leme
7e8863479e Merge "Fixed calls to update() when configuration changed." into nyc-dev am: f4f2211b13 
am: 23c69bb59f

* commit '23c69bb59fa0eb76d9c5e0b6cfeb0af066b4c42d':
  Fixed calls to update() when configuration changed.

Change-Id: I525d4a70ff91c28809ecb01e184587d889060df9
 2016-05-13 17:47:12 +00:00
Felipe Leme
312ecda0ec Merge "Fixed calls to update() when configuration changed." into nyc-dev 
am: f4f2211b13

* commit 'f4f2211b1364422abec41e056af77c03247c3f4e':
  Fixed calls to update() when configuration changed.

Change-Id: I0192f6a8e94996adbe458f523b0b004b73aa955f
 2016-05-13 17:44:45 +00:00
Felipe Leme
23c69bb59f Merge "Fixed calls to update() when configuration changed." into nyc-dev 
am: f4f2211b13

* commit 'f4f2211b1364422abec41e056af77c03247c3f4e':
  Fixed calls to update() when configuration changed.

Change-Id: Ia35d89560fe2dd51d1c0dc8da3d1209c2cb03622
 2016-05-13 17:44:41 +00:00
Felipe Leme
62a10806ee Merge "Removed onRestrictPowerChanged()." into nyc-dev am: 85f4269c9f am: 828852a7cc 
am: 1848956500

* commit '18489565007c24cafe80dec8e3b7d9d1669b35e3':

Change-Id: I611614eed2bb31c72542bc1c1b79d328eb61c40d
 2016-05-13 17:38:38 +00:00
Felipe Leme
85779c82be Merge "Removed onRestrictPowerChanged()." into nyc-dev am: 85f4269c9f am: 7fe77ae5db 
am: cfe2bfd8b4

* commit 'cfe2bfd8b4ce35c684ddfe696e9f88a270d59b55':
  Removed onRestrictPowerChanged().

Change-Id: I312a9a17609741ab5725e3e2ba409eb9e63b30f7
 2016-05-13 17:38:35 +00:00
TreeHugger Robot
f4f2211b13 Merge "Fixed calls to update() when configuration changed." into nyc-dev 2016-05-13 17:35:20 +00:00
Felipe Leme
1848956500 Merge "Removed onRestrictPowerChanged()." into nyc-dev am: 85f4269c9f 
am: 828852a7cc

* commit '828852a7cc5407141c6aa866228267d6932f6a7a':

Change-Id: I941f72d668a5bd5ab712472887a4b4ef89136d16
 2016-05-13 17:31:15 +00:00
Felipe Leme
cfe2bfd8b4 Merge "Removed onRestrictPowerChanged()." into nyc-dev am: 85f4269c9f 
am: 7fe77ae5db

* commit '7fe77ae5db69a5ed6e50faa7fd345d4e29ff807a':
  Removed onRestrictPowerChanged().

Change-Id: I6619f264a5ce8692bab48b2e6af64b534d88b238
 2016-05-13 17:28:43 +00:00
Felipe Leme
828852a7cc Merge "Removed onRestrictPowerChanged()." into nyc-dev 
am: 85f4269c9f

* commit '85f4269c9f3c79f19b2263fc15d2404bde0e1f0e':
  Removed onRestrictPowerChanged().

Change-Id: If0c2f4eb4db3107aeabecb236b5aec93f252f57e
 2016-05-13 17:25:34 +00:00
Felipe Leme
7fe77ae5db Merge "Removed onRestrictPowerChanged()." into nyc-dev 
am: 85f4269c9f

* commit '85f4269c9f3c79f19b2263fc15d2404bde0e1f0e':
  Removed onRestrictPowerChanged().

Change-Id: Ie44a6664f2fb91a7556d4d8700ce18da8e6512f3
 2016-05-13 17:25:33 +00:00
TreeHugger Robot
85f4269c9f Merge "Removed onRestrictPowerChanged()." into nyc-dev 2016-05-13 17:14:12 +00:00
Amit Mahajan
112f529327 Merge "Fix cannot build prefer or restore APN for Secondary SIM/Sub." am: 5620699fb9 am: 1545987bec am: 68026dbac5 
am: 038fe280c4

* commit '038fe280c4adbcba85a785602a7609717621bdc1':
  Fix cannot build prefer or restore APN for Secondary SIM/Sub.

Change-Id: I39721e53c7b2bdd63ccbda18a321bc6eb4fa1d03
 2016-05-13 16:59:53 +00:00
Yifan Bai
038fe280c4 Merge "Fix cannot build prefer or restore APN for Secondary SIM/Sub." am: 5620699fb9 am: 1545987bec 
am: 68026dbac5

* commit '68026dbac56aa837ffd2fead4a2a59440ee3729c':
  Fix cannot build prefer or restore APN for Secondary SIM/Sub.

Change-Id: I3f60ca9fc7d70e6fbc383a18f3238ed341beb968
 2016-05-13 16:57:19 +00:00
Amit Mahajan
68026dbac5 Merge "Fix cannot build prefer or restore APN for Secondary SIM/Sub." am: 5620699fb9 
am: 1545987bec

* commit '1545987bec5f2f8c5b98c1cfbba610ece2d537b0':
  Fix cannot build prefer or restore APN for Secondary SIM/Sub.

Change-Id: I739817ba6a0adfdd1b8edf9d04ee135346f1283a
 2016-05-13 16:54:49 +00:00
Yifan Bai
1545987bec Merge "Fix cannot build prefer or restore APN for Secondary SIM/Sub." 
am: 5620699fb9

* commit '5620699fb99cd4f56c9956e6a2cab99bab0126f8':
  Fix cannot build prefer or restore APN for Secondary SIM/Sub.

Change-Id: Ib5c1c6deb878d91f684c4cd8ff4151d8dbb562a5
 2016-05-13 16:52:14 +00:00
Amit Mahajan
5620699fb9 Merge "Fix cannot build prefer or restore APN for Secondary SIM/Sub." 2016-05-13 16:45:26 +00:00
Makoto Onuki
d819814c63 ShortcutManager: Remove developer option from NYC 
Bug 28704708

Change-Id: Ib2301ea556104e9ffd6a18885e228717843d6acb
 2016-05-13 09:40:26 -07:00
Victor Chang
9051ebc1e7 Merge "Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd am: 6b5c77a752" into nyc-mr1-dev-plus-aosp 
am: 11d550647e

* commit '11d550647ecee76492494ddea9ac1fc0bd078af2':

Change-Id: I4a3bf9983bd70cd20fa850f48012673c4b235daf
 2016-05-13 15:17:49 +00:00
Victor Chang
fd965b82bc Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd am: 2c41dea8b3 
am: 1eb6b46304

* commit '1eb6b46304f26d5b8d5b956a8d9852e473bf4cae':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: Ic086a7d10107e7d752d41c3118ec3453047b1210
 2016-05-13 15:17:49 +00:00
Android Build Merger (Role)
11d550647e Merge "Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd am: 6b5c77a752" into nyc-mr1-dev-plus-aosp 2016-05-13 15:15:30 +00:00
Victor Chang
1eb6b46304 Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd 
am: 2c41dea8b3

* commit '2c41dea8b37a0289c3f07fbf7cbd5e682523b7a3':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: I1e119d62cd1369cdd6365c9b3e06d299f30299e8
 2016-05-13 15:15:16 +00:00
Victor Chang
de28ad5109 Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd 
am: 6b5c77a752

* commit '6b5c77a7527785418321539db1c294482910ef90':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: I949f43532944af2b417d7949031df484e25ac807
 2016-05-13 15:15:16 +00:00
Victor Chang
2c41dea8b3 Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev 
am: 19c7ef11bd

* commit '19c7ef11bdc649b3619f421946225d8953218fd1':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: I3394d9eb0808f795b8dcce03578a0631731b2bee
 2016-05-13 15:12:50 +00:00
Victor Chang
6b5c77a752 Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev 
am: 19c7ef11bd

* commit '19c7ef11bdc649b3619f421946225d8953218fd1':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: I85bb03da5e85fb401e672783295e5f545dbd10ab
 2016-05-13 15:12:49 +00:00
Victor Chang
19c7ef11bd Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev 2016-05-13 15:08:17 +00:00
Steven Ng
3fe140315d Add a Global setting for disabling OEM unlocking setting 
+ Don't enable OEM unlocking setting if the global setting disallows it.

Bug: 28163088
Change-Id: Ic306da3fa2cecb90865be055566a7e1603e6b5e2
 2016-05-13 14:09:59 +00:00
Victor Chang
cba033e4b5 Fix NULL instead of DPC name is displayed in Certificate warning 
Bug: 28752118

Change-Id: I5a6e17efd92aaea5188d83f2ccb7e7b8d1f1dc1b
 2016-05-13 14:45:30 +01:00
Yifan Bai
e00ab6c5d9 Fix cannot build prefer or restore APN for Secondary SIM/Sub. 
When built prefer or restore APN with URI, the URI does not contain Sub
Id. This leads to the fail of display selected APN on Secondary SIM/Sub.
To fix, SubId needs to be appended in the URI.

Change-Id: If4b98b0bdd02474b3e7b7537c5a1257dcdbe9511
 2016-05-13 01:36:30 +00:00