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
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
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
Maurice Lam
b12079a7f1
Merge "Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172
am: 1bc12ee9c2" into nyc-mr1-dev-plus-aosp
...
am: 544b4f9043
* commit '544b4f90436e8903dfd814194d7832002ecf88e1':
Change-Id: Ie4c6dec11436d92ee14dafff31dfd86818f56ce6
2016-05-13 01:11:14 +00:00
Maurice Lam
2d94f9fd68
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172
am: c67ad0184a
...
am: 7e81460665
* commit '7e814606650ef88bfa60115f6c1269a422603da3':
[ScreenLock] Use requested quality for encryption popup
Change-Id: I5c3c9b459cf65d8d8007bf10ee941e24284d57fd
2016-05-13 01:11:14 +00:00
Android Build Merger (Role)
544b4f9043
Merge "Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172
am: 1bc12ee9c2" into nyc-mr1-dev-plus-aosp
2016-05-13 01:02:23 +00:00
Maurice Lam
c89dafa84e
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172
...
am: 1bc12ee9c2
* commit '1bc12ee9c25ea42c660d11244b8ff9a0c03ba3c0':
[ScreenLock] Use requested quality for encryption popup
Change-Id: Ic93f54828b93bd167c73de8736b02345a45639e8
2016-05-13 01:02:15 +00:00
Maurice Lam
7e81460665
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev am: 102b368172
...
am: c67ad0184a
* commit 'c67ad0184ac4c2ac1fc07330801972499e38da2e':
[ScreenLock] Use requested quality for encryption popup
Change-Id: I539c7c36f550f5cd60fb3e05f91dfa58b0a5077f
2016-05-13 01:02:14 +00:00
Maurice Lam
c67ad0184a
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
...
am: 102b368172
* commit '102b368172b4e8201b32efb686b3f3334e5ddbda':
[ScreenLock] Use requested quality for encryption popup
Change-Id: Ie7d91698bc3e81d4149dc6b8ab96bf00c5d4451e
2016-05-13 00:59:26 +00:00
Maurice Lam
1bc12ee9c2
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
...
am: 102b368172
* commit '102b368172b4e8201b32efb686b3f3334e5ddbda':
[ScreenLock] Use requested quality for encryption popup
Change-Id: I9373cd533e57006e71e9ea7df064f203994c7217
2016-05-13 00:59:26 +00:00
Maurice Lam
102b368172
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
2016-05-13 00:51:09 +00:00
Maurice Lam
8890f7acbd
[ScreenLock] Use requested quality for encryption popup
...
Use the requested password quality instead of the currently-in-use
password quality because encryption interstitial is shown before
the lock type is updated.
Bug: 28326234
Change-Id: I9ae950bab48f62033c59b582218c8a586f5b71ba
2016-05-12 16:24:41 -07:00
Felipe Leme
6ebd561960
Fixed calls to update() when configuration changed.
...
update() is an expensive operation and should only be called
once under normal circumstances (it still needs to be called due to external changes). In particular, it should not be called again on orientation changes.
The first approach to solve the orientation change caused the volume title to not be shown when the screen changed on multi window environments; the fix for title issue caused the update to be called again on configuration changes.
This change properly fixes both issues by removing the onAttach() / onDetach() methods and using a clearer variable (mNeedsUpdate) to avoid future regressions.
BUG: 24508289
BUG: 27989238
Change-Id: I140f5a541cda293f1c476d3b80a5bc8918e18b08
2016-05-12 14:43:35 -07:00
Adrian Roos
c2030b0e1d
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a
am: e7c67aae22
...
am: a63fa6f4b7
* commit 'a63fa6f4b7cd3fc4b60742b7411c1f450d0a7840':
Change-Id: I1c53260022958c776cc90cd62858a9dbe9db2bc3
2016-05-12 21:10:13 +00:00
Adrian Roos
a63fa6f4b7
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a
...
am: e7c67aae22
* commit 'e7c67aae2253dc67df10270f1edd5e33aca43714':
Change-Id: Ibb6f3795656ebf7a359350d8ac37b0d29ec15597
2016-05-12 21:06:14 +00:00
Adrian Roos
373060c2a3
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a
am: 1d1ca8e590
...
am: 3b7eedabb8
* commit '3b7eedabb85f18229911a67d91864849532f8bba':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: Iadad066e04fde46b247634b9f2d36f472deb4285
2016-05-12 21:06:07 +00:00
Adrian Roos
3b7eedabb8
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a
...
am: 1d1ca8e590
* commit '1d1ca8e5905c100efde0ffdfcc8b1dcc7dbc32c8':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I2e2310c09f240beb92146d8d24c4bc6fdc413364
2016-05-12 21:02:28 +00:00
Adrian Roos
e7c67aae22
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
...
am: ef505d628a
* commit 'ef505d628ae96f175fca871013da8c24271667dc':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: Ieaa1f148c3db5fc41e1bb51faf987eac1b896bd4
2016-05-12 21:00:03 +00:00
Adrian Roos
1d1ca8e590
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
...
am: ef505d628a
* commit 'ef505d628ae96f175fca871013da8c24271667dc':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I5746a924564e8eb866b0c0e0a1e0205a38896f89
2016-05-12 20:59:47 +00:00
Adrian Roos
ef505d628a
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
2016-05-12 20:52:25 +00:00
Adrian Roos
059b0fa060
Allow DPMs to restrict Remote Input on Keyguard
...
Change-Id: I84b90b4047129794f1397351f9c8624f0048ad41
Fixes: 26981262
2016-05-12 19:12:17 +00:00
Fan Zhang
c6b411d58a
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev am: f5746f9078
...
am: 1fb38d03bf
* commit '1fb38d03bf6c9ce43114f0ec9f20c07b6c93e3cc':
Update suggestion/support UI to use more negative space.
Change-Id: Ibfa15b9c1c8d8f3b29dd3c7b31cee03c9021af7b
2016-05-12 18:53:55 +00:00
Fan Zhang
1fb38d03bf
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev
...
am: f5746f9078
* commit 'f5746f90781c40380f8ec3057abcf9c67d830882':
Update suggestion/support UI to use more negative space.
Change-Id: Ie1f58f267b284735b7f2c86741a516d385f07530
2016-05-12 18:51:10 +00:00