Commit Graph

26816 Commits

Author SHA1 Message Date
Robert Greenwalt
aae2022cb5 Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9
am: eb88257f07

* commit 'eb88257f076323771fd1e9805708441efc2af03f':
  Fix register multiple PhoneStateListeners.

Change-Id: Iece8c8bd197ed03835720f31174c710495a5998f
2016-05-18 18:06:49 +00:00
yifan.bai
eb88257f07 Merge "Fix register multiple PhoneStateListeners."
am: 91f6b496a9

* commit '91f6b496a99e085d853d684485c8486125f83f45':
  Fix register multiple PhoneStateListeners.

Change-Id: I00a37f58a9f2eccb138bbbdee2bc05323e05237a
2016-05-18 18:02:56 +00:00
Robert Greenwalt
91f6b496a9 Merge "Fix register multiple PhoneStateListeners." 2016-05-18 17:54:47 +00:00
Julia Reynolds
d6575bcee2 Merge "Null check." into nyc-dev
am: fc1bb74186

* commit 'fc1bb74186c61712041dfa25e446391f7d8904a1':
  Null check.

Change-Id: I1a170686d9df0c0094d154b2570f08f6145fe831
2016-05-18 14:10:13 +00:00
Julia Reynolds
fc1bb74186 Merge "Null check." into nyc-dev 2016-05-18 14:02:05 +00:00
Yohei Yukawa
eb84d19de2 Follow class package change: LocaleList
am: 1ef9c4afd5

* commit '1ef9c4afd56b534f836c38437624eabaa6691f0b':
  Follow class package change: LocaleList

Change-Id: I725ad37be16a6175541a845cf537617f87dab7a1
2016-05-18 02:24:58 +00:00
Yohei Yukawa
1ef9c4afd5 Follow class package change: LocaleList
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1].  This CL follows up that
package change.

No behavior change is intended.

 [1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18

Bug: 28819696
Change-Id: Ibd7934b30062046830d63f33d1c6febef32da976
2016-05-17 16:25:39 -07:00
pkanwar
23e8435899 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev
am: 4dd2fdf90b

* commit '4dd2fdf90b97b64931cbb1c7ca69b38cef58662e':
  Choose Bluetooth Device window cant't fill screen

Change-Id: I3134f37ab8e0ac3e7367d26141c4a882051e8652
2016-05-17 22:31:15 +00:00
Pankaj Kanwar
4dd2fdf90b Merge "Choose Bluetooth Device window cant't fill screen" into nyc-dev 2016-05-17 22:16:49 +00:00
Julia Reynolds
47beeec10b Null check.
Change-Id: I16dfe2cf265b4254aa69bc6165a8f72fc3954d7a
Fixes: 28531037
2016-05-17 16:14:10 -04:00
pkanwar
956597eaf8 Choose Bluetooth Device window cant't fill screen
b/28684861: fixed the layout file to ensure that the separators cover
the entire screen.

Change-Id: I4471a1da901c9a4c0830ff0dfc943cd087ee1702
2016-05-17 12:03:42 -07:00
Felipe Leme
df9714e9de Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev
am: c769ddd330

* commit 'c769ddd330c7b5734c5c319ef7fc3cabd0c226f8':
  Implemented onRestrictBackgroundBlacklistChanged().

Change-Id: Ia3bd9fa234c8ccff136e9999b87abf642ecc9d17
2016-05-17 18:43:58 +00:00
TreeHugger Robot
c769ddd330 Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev 2016-05-17 18:28:21 +00:00
shwetachahar
d16f4fd531 Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
am: 1cb87b2af5

* commit '1cb87b2af57df71d56951c43aa28b8d01b4fb2a7':
  Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.

Change-Id: Id9f34074524813aedcf2994fd1a424b5e2b0185c
2016-05-17 14:32:45 +00:00
Shweta Chahar
1cb87b2af5 Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev 2016-05-17 14:27:09 +00:00
shwetachahar
43d93289ba Modify the TTS engine preference UI so that the radio button and the TTS
engine name are a single focusable element.

Bug: 27136946
Change-Id: I502634e0942b9fe30e290ce9de6ba293f33bf863
2016-05-17 13:56:57 +01:00
yifan.bai
4bf1704650 Fix register multiple PhoneStateListeners.
To avoid multiple PhoneStateListeners are registered, when user changes
the tab between SIMs, unregister the previous listener.

Change-Id: I99cf36a2c25bfbb74322b55efc6d751ea96810e5
2016-05-17 09:47:43 +00:00
Felipe Leme
b2c4949de7 Implemented onRestrictBackgroundBlacklistChanged().
BUG: 28743623

Change-Id: I2d8620360858660fed0e745b16dc61ce262b90b9
2016-05-16 20:43:12 +00:00
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