Commit Graph

26798 Commits

Author SHA1 Message Date
Sudheer Shanka
7cc2fa51d1 Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
am: 31fb2a7a1d

* commit '31fb2a7a1d3ee27ad7f47fb26cd5900b033ef24d':
  Fix crash in SetupRedactionInterstitial.

Change-Id: I526e7fe3e9c11bb36babc386c1cbbcb0187e6bbd
2016-05-16 20:22:31 +00:00
Julia Reynolds
edd4824d44 Merge "Fix crash on rotation." into nyc-dev
am: 075690875b

* commit '075690875b437822d23dc38df5e1c02564a7b83e':
  Fix crash on rotation.

Change-Id: I6bb07ec33e7fa029047d416d758cfa8e6985d3af
2016-05-16 20:19:50 +00:00
TreeHugger Robot
31fb2a7a1d Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev 2016-05-16 20:19:07 +00:00
Julia Reynolds
075690875b Merge "Fix crash on rotation." into nyc-dev 2016-05-16 20:12:06 +00:00
Julia Reynolds
176b28663b Fix crash on rotation.
Change-Id: Ife0a040bfc1a6ecc579d544f78cc45e37f5bca3c
Fixes: 28767083
2016-05-16 15:56:15 -04:00
Sudheer Shanka
dc3ed0a5bf Fix crash in SetupRedactionInterstitial.
Change-Id: Ia662cd60e4c9eeaccd0eb168431e755c2c79b676
Fixes: 28785168
2016-05-16 11:46:34 -07:00
Julia Reynolds
84082aac24 Merge "Catch rule creation exceptions." into nyc-dev
am: f1c2e62f4e

* commit 'f1c2e62f4ec00205dc1e78ff66e77d8380d9a6f2':
  Catch rule creation exceptions.

Change-Id: I2d5d9e15f0c86b700b8c3a058e3cf92e36591173
2016-05-16 18:29:21 +00:00
Julia Reynolds
f1c2e62f4e Merge "Catch rule creation exceptions." into nyc-dev 2016-05-16 18:22:15 +00:00
Clara Bayarri
41db2612ff Rename requestKeyboardShortcutsHelper
am: fcc411c807

* commit 'fcc411c8078e4be5f1f77d7a28b8ce0be20206d5':
  Rename requestKeyboardShortcutsHelper

Change-Id: I807f9d504e2a93b2090f22261c9ff911eb3349cc
2016-05-16 15:09:33 +00:00
Julia Reynolds
992422fd5e Catch rule creation exceptions.
Bug: 28775583
Change-Id: I54c4af0352c88b27717660741709ec54e4749656
2016-05-16 09:53:23 -04:00
Clara Bayarri
fcc411c807 Rename requestKeyboardShortcutsHelper
Per API Council feedback

Bug: 28775576
Change-Id: Ia19668dceb7da2222e9716fcb1caff8d0ee86c41
2016-05-16 14:16:46 +01:00
Sudheer Shanka
3ad3bd66ad Merge "Guard against exception when getting package installer info." into nyc-dev
am: 15c1bb48c3

* commit '15c1bb48c3da3404a775c7101e3559772aa37d6e':
  Guard against exception when getting package installer info.

Change-Id: Ibe6459ec92ffe90872c3380d865baea6cb257508
2016-05-13 21:29:01 +00:00
TreeHugger Robot
15c1bb48c3 Merge "Guard against exception when getting package installer info." into nyc-dev 2016-05-13 21:18:06 +00:00
Sudheer Shanka
aed0537aaf Guard against exception when getting package installer info.
Bug: 28742227
Change-Id: I8742c882ae6b18cb8f51a9da04170358a20a7d48
2016-05-13 12:58:42 -07: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
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
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
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
TreeHugger Robot
f4f2211b13 Merge "Fixed calls to update() when configuration changed." into nyc-dev 2016-05-13 17:35:20 +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
TreeHugger Robot
85f4269c9f Merge "Removed onRestrictPowerChanged()." into nyc-dev 2016-05-13 17:14:12 +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
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
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
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
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
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
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
Julia Reynolds
d9dffc6080 Merge "Update lock timeout value after pref change." into nyc-dev
am: 1590b8c005

* commit '1590b8c0055057a392883fe891d21fc659b60813':
  Update lock timeout value after pref change.

Change-Id: Ib9da57d196586c76133dd25e918c92c05bc08eba
2016-05-12 17:55:56 +00:00
Julia Reynolds
1590b8c005 Merge "Update lock timeout value after pref change." into nyc-dev 2016-05-12 17:53:27 +00:00
Julia Reynolds
de4f471e55 Update lock timeout value after pref change.
Change-Id: I0d16256cb61e2db481d99349cd49c17e51de7c87
Fixes: 28734916
2016-05-12 13:48:34 -04:00
Maurice Lam
3fdb526bbd Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
am: aead073d44

* commit 'aead073d4494c6b764cb384cdb96c79ec5a37aa5':
  Set Wi-Fi dialog spinners to 48dps tall

Change-Id: I66c985b54718ff2a6e66b54ba67d4ccae44a09c6
2016-05-12 17:47:46 +00:00
Maurice Lam
aead073d44 Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev 2016-05-12 17:42:19 +00:00
Gustav Sennton
04af74dae0 Merge "Disable WebViewSetting for non-admin users." into nyc-dev
am: f76993a9da

* commit 'f76993a9da046ac762ef6cd39b7eb0baa81e8871':
  Disable WebViewSetting for non-admin users.

Change-Id: Icc42bdd0c0737be358301a6697db05df079a3941
2016-05-12 13:29:11 +00:00
Gustav Sennton
f76993a9da Merge "Disable WebViewSetting for non-admin users." into nyc-dev 2016-05-12 13:23:55 +00:00
Gustav Sennton
66313bb11d Disable WebViewSetting for non-admin users.
For an app to be able to know whether the WebViewSetting is enabled for
a user we disable the setting at boot for non-admin users. In this way
an app can call intent.resolveActivity[Info] for the WebViewSetting
intent to check whether the WebViewSetting is enabled before linking to
it.

Bug: 28034166
Change-Id: I33b3fa10a38f2a2600cddd0891ef746126abdd61
2016-05-12 11:13:26 +01:00
Jim Miller
975d4245b3 Merge "Show signal strength indication while in CryptKeeper" into nyc-dev
am: 3086911e25

* commit '3086911e2578ca7391c46f230edfb0f968dec38e':
  Show signal strength indication while in CryptKeeper

Change-Id: I68e310a264404efe0f2839d6047e091925da8cb1
2016-05-12 02:12:54 +00:00
Jim Miller
3086911e25 Merge "Show signal strength indication while in CryptKeeper" into nyc-dev 2016-05-12 01:52:34 +00:00
Dianne Hackborn
c553d79b39 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev
am: 2dec0c7839

* commit '2dec0c7839784940601df3f2110a552a5cf73400':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: I6d31dd4cd2dc9c56bb0ee131e7de667d3e5cb6de
2016-05-12 00:51:45 +00:00
Dianne Hackborn
2dec0c7839 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev 2016-05-12 00:40:16 +00:00