Julia Reynolds
53faf747f6
Merge "Remove Notification Topics." into nyc-dev am: 73d96fb4bb
...
am: f7f055e407
* commit 'f7f055e40709d8de6bad8f4384f4dc59adceb213':
Remove Notification Topics.
2016-02-19 19:32:13 +00:00
Julia Reynolds
f7f055e407
Merge "Remove Notification Topics." into nyc-dev
...
am: 73d96fb4bb
* commit '73d96fb4bbe1e3796e655314619bf9897d07c929':
Remove Notification Topics.
2016-02-19 19:25:04 +00:00
Julia Reynolds
73d96fb4bb
Merge "Remove Notification Topics." into nyc-dev
2016-02-19 19:17:25 +00:00
Jason Monk
9e4f241ba4
Merge changes Ie427a2d8,I213f1f76 into nyc-dev am: ea168d229d
...
am: 0aecf08207
* commit '0aecf08207267bcbf36af9c8f4dd8daad0f14283':
SysUI Tuner: UI cleanup and grouping
SysUI Tuner: Night mode v3
2016-02-19 19:05:18 +00:00
Jason Monk
0aecf08207
Merge changes Ie427a2d8,I213f1f76 into nyc-dev
...
am: ea168d229d
* commit 'ea168d229d316c84652e88ad0f19adbaa884d731':
SysUI Tuner: UI cleanup and grouping
SysUI Tuner: Night mode v3
2016-02-19 18:59:47 +00:00
Jason Monk
ea168d229d
Merge changes Ie427a2d8,I213f1f76 into nyc-dev
...
* changes:
SysUI Tuner: UI cleanup and grouping
SysUI Tuner: Night mode v3
2016-02-19 18:50:05 +00:00
Svetoslav Ganov
8cc04de85f
Merge "Don\'t hold a lock while reading shared preferences from disk." into nyc-dev am: 5350306989
...
am: d24ac9abd6
* commit 'd24ac9abd617c5c1753dd1f8c662e42c4207e94e':
Don't hold a lock while reading shared preferences from disk.
2016-02-19 17:21:58 +00:00
Svetoslav Ganov
d24ac9abd6
Merge "Don\'t hold a lock while reading shared preferences from disk." into nyc-dev
...
am: 5350306989
* commit '53503069895918a59a305addaac84ea11937edcf':
Don't hold a lock while reading shared preferences from disk.
2016-02-19 17:17:48 +00:00
Svetoslav Ganov
5350306989
Merge "Don't hold a lock while reading shared preferences from disk." into nyc-dev
2016-02-19 17:12:40 +00:00
Svet Ganov
96db26032e
Don't hold a lock while reading shared preferences from disk.
...
Shared prefrences loads thir content from disk on a separate
thread to improve performance, however it holds the lock
the whole time while reading from disk which as a result blocks
operations that don't rely on reading data from being performed
intil load completes, e.g. reguistering a prefernces change
listener does not depend on having the data loaded.
bug:5254577
Change-Id: I5ad67b285631c34d5aadac7138ba8bfaa728cf94
2016-02-19 09:11:39 -08:00
Esteban Talavera
0bd7f498af
Merge "Update DevicePolicyManager parent instance documentation" into nyc-dev am: 44da29407f
...
am: d76c5fedc8
* commit 'd76c5fedc84f5d2acd18a56060f47c6701d2d8ca':
Update DevicePolicyManager parent instance documentation
2016-02-19 09:45:57 +00:00
Esteban Talavera
d76c5fedc8
Merge "Update DevicePolicyManager parent instance documentation" into nyc-dev
...
am: 44da29407f
* commit '44da29407f3228811d5c1387a184fc68c388c5c7':
Update DevicePolicyManager parent instance documentation
2016-02-19 09:42:28 +00:00
Esteban Talavera
44da29407f
Merge "Update DevicePolicyManager parent instance documentation" into nyc-dev
2016-02-19 09:37:23 +00:00
Toby Sargeant
66877c609d
Merge "add developer setting for multiprocess webview" into nyc-dev am: a7000fa864
...
am: 9381d8c44b
* commit '9381d8c44b5e30390410210ac70ca3b180068c00':
add developer setting for multiprocess webview
2016-02-19 09:22:52 +00:00
Toby Sargeant
9381d8c44b
Merge "add developer setting for multiprocess webview" into nyc-dev
...
am: a7000fa864
* commit 'a7000fa8648af2457ab07cc736e2314bbc7eba22':
add developer setting for multiprocess webview
2016-02-19 09:19:02 +00:00
Toby Sargeant
a7000fa864
Merge "add developer setting for multiprocess webview" into nyc-dev
2016-02-19 09:14:56 +00:00
Colin Cross
41bf778441
resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp
...
am: 4bf50e486f
* commit '4bf50e486f85d7a9630ded3e36216710c9d1f97d':
Add dumpsys meminfo --unreachable
2016-02-19 06:32:06 +00:00
Colin Cross
4bf50e486f
resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp
...
Change-Id: Ifdf52646440b65ca4b3aadc8bba212b5f1fd0c0d
2016-02-18 22:27:04 -08:00
Colin Cross
bd45c08468
Merge "Add dumpsys meminfo --unreachable"
...
am: 916ea08119
* commit '916ea081196a47ef3257910a71fa7a7ac609ddb1':
Add dumpsys meminfo --unreachable
2016-02-19 06:14:50 +00:00
Colin Cross
916ea08119
Merge "Add dumpsys meminfo --unreachable"
2016-02-19 06:10:36 +00:00
Svetoslav Ganov
8032741bdc
Merge "Improve requestPermissions API docs and throw correct exception." into nyc-dev am: 0f3431b616
...
am: 8a20395156
* commit '8a203951566e6e5df730c49fb35054a851eb8834':
Improve requestPermissions API docs and throw correct exception.
2016-02-19 04:16:19 +00:00
Svetoslav Ganov
8a20395156
Merge "Improve requestPermissions API docs and throw correct exception." into nyc-dev
...
am: 0f3431b616
* commit '0f3431b616e03fe76cb52cabad209f95e1d7899c':
Improve requestPermissions API docs and throw correct exception.
2016-02-19 04:10:02 +00:00
Svetoslav Ganov
0f3431b616
Merge "Improve requestPermissions API docs and throw correct exception." into nyc-dev
2016-02-19 04:03:50 +00:00
Svet Ganov
f66381cd0d
Improve requestPermissions API docs and throw correct exception.
...
bug:26220898
Change-Id: Iebda3fe13b963b10829de917fb00a9a14186b72c
2016-02-18 20:02:40 -08:00
Yohei Yukawa
9da8464a0b
Merge "Introduce InputConnection#getHandler()." into nyc-dev am: 116d872d9c
...
am: 887f7c0fe3
* commit '887f7c0fe3b6d8b08e8b53638bbfecc1de2b7f8f':
Introduce InputConnection#getHandler().
2016-02-19 02:59:19 +00:00
Yohei Yukawa
887f7c0fe3
Merge "Introduce InputConnection#getHandler()." into nyc-dev
...
am: 116d872d9c
* commit '116d872d9c3167a270407af374d4696efa1b21d7':
Introduce InputConnection#getHandler().
2016-02-19 02:52:35 +00:00
Yohei Yukawa
116d872d9c
Merge "Introduce InputConnection#getHandler()." into nyc-dev
2016-02-19 02:36:50 +00:00
Abhijith Shastry
b30c109716
Merge "Make BlockSuppressalStatus constructor public so that it can be constructed by the provider." into nyc-dev am: 5042001350
...
am: 0c5a42fc6f
* commit '0c5a42fc6f04e8ef4efce246750e06a9be9676f5':
Make BlockSuppressalStatus constructor public so that it can be constructed by the provider.
2016-02-19 00:33:39 +00:00
Dianne Hackborn
c0e1a23a26
Merge "Implement lenient background check option."
2016-02-19 00:29:54 +00:00
Abhijith Shastry
0c5a42fc6f
Merge "Make BlockSuppressalStatus constructor public so that it can be constructed by the provider." into nyc-dev
...
am: 5042001350
* commit '5042001350bcc74fc58a77eb1122dc4a64a703df':
Make BlockSuppressalStatus constructor public so that it can be constructed by the provider.
2016-02-19 00:26:16 +00:00
Abhijith Shastry
5042001350
Merge "Make BlockSuppressalStatus constructor public so that it can be constructed by the provider." into nyc-dev
2016-02-19 00:21:16 +00:00
Abhijith Shastry
a4e836c174
Make BlockSuppressalStatus constructor public so that it can be constructed by the provider.
...
BUG: 26989170
Change-Id: I9fae7fc03b34b4081c7096eb13fa38737b52efe6
2016-02-18 16:15:58 -08:00
Adam Powell
dbc45f3778
Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev am: 35c8e0fcf2
...
am: e0967f875e
* commit 'e0967f875ebf080b4231a56e7252905c334fe7dc':
Fix NPE for Fragment#setUserVisibleHint(true)
2016-02-18 23:58:46 +00:00
Adam Powell
e0967f875e
Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev
...
am: 35c8e0fcf2
* commit '35c8e0fcf2e26f24ac21bb3df87158d4a0f4587f':
Fix NPE for Fragment#setUserVisibleHint(true)
2016-02-18 23:53:06 +00:00
Adam Powell
35c8e0fcf2
Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev
2016-02-18 23:44:15 +00:00
Yohei Yukawa
ae461a986c
Merge "Stop granting default Contacts permission to IMEs." into nyc-dev am: 5eb148bab6
...
am: 46012e0fde
* commit '46012e0fde4fb6435241ceef5f0bcecea8ea9984':
Stop granting default Contacts permission to IMEs.
2016-02-18 23:38:33 +00:00
Yohei Yukawa
46012e0fde
Merge "Stop granting default Contacts permission to IMEs." into nyc-dev
...
am: 5eb148bab6
* commit '5eb148bab6ea49c4c646649692ae6769b9c4e54c':
Stop granting default Contacts permission to IMEs.
2016-02-18 23:31:33 +00:00
Adam Powell
255b008afe
Fix NPE for Fragment#setUserVisibleHint(true)
...
Fix a bug where calling setUserVisibleHint(true) before adding a
Fragment to a FragmentManager could cause a crash.
Bug 27250018
Change-Id: Id192ae31bab95f15d32de9f105e707bdb8691641
2016-02-18 15:17:29 -08:00
Christopher Tate
a836c545c3
Keyguard wallpaper am: be132e6ea4
...
am: 15e95000b1
* commit '15e95000b18086fc4f5dd948207a8fa863492852':
Keyguard wallpaper
2016-02-18 23:16:51 +00:00
Yohei Yukawa
5eb148bab6
Merge "Stop granting default Contacts permission to IMEs." into nyc-dev
2016-02-18 23:16:06 +00:00
Christopher Tate
15e95000b1
Keyguard wallpaper
...
am: be132e6ea4
* commit 'be132e6ea494023d4b8c37658a34efa8b705dce9':
Keyguard wallpaper
2016-02-18 23:10:07 +00:00
Christopher Tate
be132e6ea4
Keyguard wallpaper
...
Clients can now set a lock-only wallpaper that Keyguard can
observe and choose to draw as appropriate.
Bug 25454162
Change-Id: I3fc30e02919e814b55dfded2a1a36ad9d2e55299
2016-02-18 15:01:02 -08:00
Andreas Gampe
461973b1e2
Merge "Frameworks/base: Use Log.printlns in RuntimeInit" into nyc-dev am: a2cc0c2ca2
...
am: 730eef4a82
* commit '730eef4a829e0d43facb4dbd6a657917d2716396':
Frameworks/base: Use Log.printlns in RuntimeInit
2016-02-18 22:49:45 +00:00
Adam Lesinski
d09e35a69b
Merge branch \'nyc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev am: cfd49456ec
...
am: 1720dd8618
* commit '1720dd86180c27e80fb191ed70be38cbfefc36af':
Push mapping of package name to appId to kernel.
2016-02-18 22:40:01 +00:00
Andreas Gampe
730eef4a82
Merge "Frameworks/base: Use Log.printlns in RuntimeInit" into nyc-dev
...
am: a2cc0c2ca2
* commit 'a2cc0c2ca282d9b4b8525df37bdb9e9cb0304abc':
Frameworks/base: Use Log.printlns in RuntimeInit
2016-02-18 22:36:00 +00:00
Andreas Gampe
a2cc0c2ca2
Merge "Frameworks/base: Use Log.printlns in RuntimeInit" into nyc-dev
2016-02-18 22:26:13 +00:00
Adam Lesinski
1720dd8618
Merge branch \'nyc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev
...
am: cfd49456ec
* commit 'cfd49456ecd7af35bc808f0e5a6b0ff6db444c25':
Push mapping of package name to appId to kernel.
2016-02-18 22:16:33 +00:00
Jeff Sharkey
550b38d85b
Merge "Push mapping of package name to appId to kernel." into nyc-dev
2016-02-18 22:07:06 +00:00
Andre Eisenbach
b8294d3b8e
Read Bluetooth interop database entries from settings (1/2)
...
am: 82a94d98e7
* commit '82a94d98e74b6ba0f816c675486a0672d473ecf5':
Read Bluetooth interop database entries from settings (1/2)
2016-02-18 22:02:08 +00:00
Andreas Gampe
d888beb9bf
Frameworks/base: Use Log.printlns in RuntimeInit
...
Make printlns in Log public-@hide so it can be used.
Print uncaught exceptions that will terminate the process in
RuntimeInit using printlns, so that long exception traces are not
being truncated.
Bug: 27245306
Change-Id: Ib24635f0ebdd80bd125e367302cab6a78e6a210a
2016-02-18 14:01:41 -08:00