Benjamin Franz
7f682c6ffb
Merge "Document which APIs are callable on the parent instance" into nyc-dev am: 4a53c8e
...
am: 9c17111
* commit '9c17111358687b1e9631f30b06efc3104ca27a95':
Document which APIs are callable on the parent instance
Change-Id: I2bb8e778b435e39c1b13903771550def4e1bde13
2016-04-06 12:25:40 +00:00
Benjamin Franz
9c17111358
Merge "Document which APIs are callable on the parent instance" into nyc-dev
...
am: 4a53c8e
* commit '4a53c8e70253928bf89913cb313de47450d0782f':
Document which APIs are callable on the parent instance
Change-Id: I4cd3ca078d47bcb6c3f1d34f92224e5c8eb3e05f
2016-04-06 12:23:01 +00:00
Benjamin Franz
4a53c8e702
Merge "Document which APIs are callable on the parent instance" into nyc-dev
2016-04-06 12:17:26 +00:00
Benjamin Franz
66b45f01ff
Document which APIs are callable on the parent instance
...
In DPM it is possible to retrieve a parent instance to set policies
that are applied to the profile parent. Extend the javadoc to clarify
which APIs are actually callable on the parent instance.
Bug: 27532279
Change-Id: I7ed40f8c3c7c3089283489bff41a04c70239d5a4
2016-04-06 11:59:49 +01:00
Erik Kline
5a0577a334
Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev am: 3671285
...
am: a577a3a
* commit 'a577a3a29f601fd2b71ad89eedcc52bdd8efbccb':
Make public the registerDefaultNetworkCallback API
Change-Id: Ic749ede5b84e443fed04701ecdd0f6521a77158f
2016-04-06 08:58:22 +00:00
Erik Kline
a577a3a29f
Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev
...
am: 3671285
* commit '36712853a9d0b57702ee5b1fd936ff0b9f48c151':
Make public the registerDefaultNetworkCallback API
Change-Id: I35035f991a45ec700530a83cc9cc89145ebb0bb6
2016-04-06 08:55:52 +00:00
Erik Kline
36712853a9
Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev
2016-04-06 08:51:08 +00:00
Erik Kline
2cd6cd8db1
Don\'t flush DNS cache on route changes. am: 9488787
...
am: 09a5fbd
* commit '09a5fbd6ec86000f95423a47e9266ee124609cb3':
Don't flush DNS cache on route changes.
Change-Id: I0e019a46548bbc81628939989fad39f96bc83ebe
2016-04-06 04:00:25 +00:00
Erik Kline
09a5fbd6ec
Don\'t flush DNS cache on route changes.
...
am: 9488787
* commit '94887874e385797ac5290e867fe412b9d6fc2f9c':
Don't flush DNS cache on route changes.
Change-Id: I4217b342b63f6d0aa58ecad1b2e84de903563e07
2016-04-06 03:57:00 +00:00
Erik Kline
f46600d074
Make public the registerDefaultNetworkCallback API
...
Change-Id: I89d7a6f49f5d6a0da3402a07407b0f8d93181b4f
2016-04-06 12:22:47 +09:00
Erik Kline
94887874e3
Don't flush DNS cache on route changes.
...
Since Lollipop, routes are isolated within Networks. Flushing a
Network's DNS cache whenever that same Network's routes are updated
doesn't provide any benefit. Any system components depending on this
behaviour need to uncovered and fixed.
Additionally, clean up no-longer-used flushNetworkDnsCache(). This
should be replaced, when needed, by a proper binder interface to netd.
Change-Id: I34bf79e4839da014d466058a876d754209d0c007
2016-04-06 11:30:51 +09:00
Erik Kline
914c689a4c
Merge "Delete unused DnsPinger" into nyc-dev am: 49e2db1
...
am: 58e0a1c
* commit '58e0a1c7623f8816404f8db049edad9a9eb9beaf':
Delete unused DnsPinger
Change-Id: I797eea73323a6506648c1b0e4fd2a6695f661fae
2016-04-06 02:17:59 +00:00
Svetoslav Ganov
99017ede1d
Merge "Remove unusable a11y APIs for ClickableSpans." into nyc-dev am: f13f14e
...
am: 30457a1
* commit '30457a1dcebacac639326cbbf8960934c980afe1':
Remove unusable a11y APIs for ClickableSpans.
Change-Id: I819d8bc38f6a7fe33fbb1a8550d4beacac7f2f30
2016-04-06 02:17:57 +00:00
Erik Kline
58e0a1c762
Merge "Delete unused DnsPinger" into nyc-dev
...
am: 49e2db1
* commit '49e2db1b10c8b8d6833c8c2d2d6dc7f100489fee':
Delete unused DnsPinger
Change-Id: Ia5d84694855a9f2a5336b318722b87f40e7d8f4b
2016-04-06 02:14:36 +00:00
Phil Weaver
30457a1dce
Merge "Remove unusable a11y APIs for ClickableSpans." into nyc-dev
...
am: f13f14e
* commit 'f13f14ef30a147681854223871c1352d154d9d7a':
Remove unusable a11y APIs for ClickableSpans.
Change-Id: I26a1ef96962058694ecf0c92e9a75e196c2ada99
2016-04-06 02:14:33 +00:00
Erik Kline
49e2db1b10
Merge "Delete unused DnsPinger" into nyc-dev
2016-04-06 02:07:02 +00:00
Svetoslav Ganov
f13f14ef30
Merge "Remove unusable a11y APIs for ClickableSpans." into nyc-dev
2016-04-06 02:05:42 +00:00
Eino-Ville Talvala
35eefdb1c1
Merge "Camera: Null check remote binder interface" into nyc-dev am: 255490c
...
am: e01da42
* commit 'e01da4230fc3276f221c8fde7518ed34ad41742e':
Camera: Null check remote binder interface
Change-Id: I3e85f26afd79c6a580a74e9d2f63cafbb7c12001
2016-04-06 01:31:14 +00:00
Eino-Ville Talvala
e01da4230f
Merge "Camera: Null check remote binder interface" into nyc-dev
...
am: 255490c
* commit '255490c33cd84b03d164a6c6f4f00680d83e057f':
Camera: Null check remote binder interface
Change-Id: Ic1e76cd3cdb1c9c0bed5e97676f3ae347a732e88
2016-04-06 01:27:47 +00:00
Eino-Ville Talvala
255490c33c
Merge "Camera: Null check remote binder interface" into nyc-dev
2016-04-06 01:19:13 +00:00
Eino-Ville Talvala
0305624f3d
Camera: Null check remote binder interface
...
For LEGACY mode, there's no remote binder, so need to null check for
that case.
Bug: 28000512
Change-Id: I31035f16fd32875d0bd84ca801927498e86133b3
2016-04-05 18:12:11 -07:00
Eino-Ville Talvala
4fde3f3493
Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev am: 2a6f476
...
am: 42b53cc
* commit '42b53cc1fcc09acb0257731a7fa2e24ef2ba033d':
Camera2: Unlink camera device death listener on disconnect
Change-Id: Ib00cc996357732ae261fc6e6af90b737582ee536
2016-04-05 23:38:33 +00:00
Jeremy Joslin
be6fe330aa
Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev am: b770ed1
...
am: 7acd105
* commit '7acd10541142fef3e6bff673e6770de27076df7b':
Have the NetworkScoreService bind to the scorer.
Change-Id: I2fc501b9380aa9c4411df52bbeb4e846c14ce802
2016-04-05 23:38:23 +00:00
Chris Tate
1f91a937f7
Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev am: 71f4e14
...
am: 1ecb55a
* commit '1ecb55a2beacb056f5e1cd58a748fd10f8238ac4':
API feedback: clarify onQuotaExceeded() documentation
Change-Id: Ia5a1f1a467edd1f7dd2d025f70018291126ffce6
2016-04-05 23:32:36 +00:00
Kirill Grouchnikov
2e9400dd4a
Merge "Return correct unfocused month date color for pre-Material themes." into nyc-dev am: 12454dc
...
am: a8dc3d4
* commit 'a8dc3d426f5e0a20eb7ea2f5b11cef4ff06be5f4':
Return correct unfocused month date color for pre-Material themes.
Change-Id: Icf77dc0052a3f24db4a2efe2a9fa3810316930b9
2016-04-05 23:32:29 +00:00
Eino-Ville Talvala
42b53cc1fc
Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev
...
am: 2a6f476
* commit '2a6f4768366b78965326710410fe938644feb60d':
Camera2: Unlink camera device death listener on disconnect
Change-Id: Iddfc98e8d4aa699f1411d609589d729e323fb994
2016-04-05 23:25:27 +00:00
Jeremy Joslin
7acd105411
Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev
...
am: b770ed1
* commit 'b770ed132813356c2b1548b0a98c1edb565c7340':
Have the NetworkScoreService bind to the scorer.
Change-Id: I319344d3362068624b4f3bda7f1cf1d563507115
2016-04-05 23:25:18 +00:00
Christopher Tate
1ecb55a2be
Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev
...
am: 71f4e14
* commit '71f4e1440202e884f99c00a1012669a5b43c4078':
API feedback: clarify onQuotaExceeded() documentation
Change-Id: I77d195725db157eb22c48f5c6b28dfe30dad2f2b
2016-04-05 23:24:59 +00:00
Kirill Grouchnikov
a8dc3d426f
Merge "Return correct unfocused month date color for pre-Material themes." into nyc-dev
...
am: 12454dc
* commit '12454dcab13a0b570937381d11f1c69fdde2fdbf':
Return correct unfocused month date color for pre-Material themes.
Change-Id: Ia26c44ef5ce30f52149a5781c363865a41dbe9e2
2016-04-05 23:24:55 +00:00
Eino-Ville Talvala
2a6f476836
Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev
2016-04-05 23:07:43 +00:00
Jeremy Joslin
b770ed1328
Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev
2016-04-05 22:27:11 +00:00
Chris Tate
71f4e14402
Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev
2016-04-05 21:51:20 +00:00
Kirill Grouchnikov
12454dcab1
Merge "Return correct unfocused month date color for pre-Material themes." into nyc-dev
2016-04-05 21:48:32 +00:00
Kirill Grouchnikov
7cf1586ce4
Return correct unfocused month date color for pre-Material themes.
...
Also deprecate setter / getter for showWeekNumber field.
Bug: 28022795
Change-Id: Ie0c33353f76c2a3d9666959a07f6809b7b85183f
2016-04-05 17:42:34 -04:00
Yohei Yukawa
306cb9ccb5
Merge "Don\'t give IME focus to temporarily detached View." into nyc-dev am: 1bc62ce
...
am: 26c8cca
* commit '26c8cca1096d9901cc4c7c9261f5f6e045620c9f':
Don't give IME focus to temporarily detached View.
Change-Id: I74a4e6014f240274033083fb91d6ec95debfac5e
2016-04-05 21:30:02 +00:00
Yohei Yukawa
26c8cca109
Merge "Don\'t give IME focus to temporarily detached View." into nyc-dev
...
am: 1bc62ce
* commit '1bc62ce8468f1e3a8ac41b6e759f145623879ba5':
Don't give IME focus to temporarily detached View.
Change-Id: I76ec7c37ba58dfaa9398edee05ea0d8dbe174f06
2016-04-05 21:26:47 +00:00
Yohei Yukawa
1bc62ce846
Merge "Don't give IME focus to temporarily detached View." into nyc-dev
2016-04-05 21:21:09 +00:00
Ajay Panicker
b6e1dafe78
Allow factory reset when bluetooth is off (1/2)
...
Bug: 27348444
Change-Id: I6c2709371b86581709649d7faf09391230449b9b
2016-04-05 20:23:21 +00:00
Sunny Goyal
4aa77870f6
Merge "Changing startListening to only fetch views which are bound" into nyc-dev am: 60c74e8
...
am: 5e59ea2
* commit '5e59ea211566c03389d221303b76444fdf58065e':
Changing startListening to only fetch views which are bound
Change-Id: I1fe22a704d0c101f504683d16ea2ea3c552adc35
2016-04-05 19:01:10 +00:00
Chris Craik
e038368eb4
Merge "Fix software layer alpha" into nyc-dev am: cd6ea77d
...
am: 3844aff
* commit '3844affcef076c72a1990540babc885f67580050':
Fix software layer alpha
Change-Id: I93829f1d888c04a9f3b120eea8810b1453024c47
2016-04-05 19:01:06 +00:00
Sunny Goyal
5e59ea2115
Merge "Changing startListening to only fetch views which are bound" into nyc-dev
...
am: 60c74e8
* commit '60c74e836fc40d65c8ac58c231956f57d26ec7eb':
Changing startListening to only fetch views which are bound
Change-Id: I811c2cb1603bef597eb958ff7fbd44a93d7075b2
2016-04-05 18:58:01 +00:00
Chris Craik
3844affcef
Merge "Fix software layer alpha" into nyc-dev
...
am: cd6ea77d
* commit 'cd6ea77d07204d2ff5e1a0264dc24db215de8614':
Fix software layer alpha
Change-Id: Ic0e8d3d5fa9e290f036d8e4fc59ee460b03020c9
2016-04-05 18:57:56 +00:00
Sunny Goyal
60c74e836f
Merge "Changing startListening to only fetch views which are bound" into nyc-dev
2016-04-05 18:53:18 +00:00
Chris Craik
cd6ea77d07
Merge "Fix software layer alpha" into nyc-dev
2016-04-05 18:50:26 +00:00
George Mount
8ade4ed2af
Merge "Restore fragment transaction animation state information." into nyc-dev am: dc63f7c6
...
am: 5f2be08
* commit '5f2be085d2179e3409d074a4d4cca98c5db71582':
Restore fragment transaction animation state information.
Change-Id: I6e63aba83c05bc8820f3776496138413e3091b8b
2016-04-05 17:44:26 +00:00
Oleksiy Vyalov
a4719f0926
Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev am: 81c9ea4
...
am: 4588a46
* commit '4588a4685062f128443fd9c2ffc0c37970d45ab5':
Send nativeDebuggable byte value as part of HELLO response.
Change-Id: I8da9f902930d5a33527d98503cd4fbdb9940a9ef
2016-04-05 17:44:23 +00:00
George Mount
5f2be085d2
Merge "Restore fragment transaction animation state information." into nyc-dev
...
am: dc63f7c6
* commit 'dc63f7c6248276d003d949dbbe407aafd5e7c6bf':
Restore fragment transaction animation state information.
Change-Id: I4eb87247e789034b2c468bd4764e4d1c9c44ab09
2016-04-05 17:36:11 +00:00
Oleksiy Vyalov
4588a46850
Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev
...
am: 81c9ea4
* commit '81c9ea4034186cd3ff2c387972389eb3397aba46':
Send nativeDebuggable byte value as part of HELLO response.
Change-Id: I317d3ee0c8c397671c31b858e9c33bffbe53f7cf
2016-04-05 17:36:09 +00:00
Yohei Yukawa
3b30e66d8a
Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev am: e470fcf
...
am: eadb88f
* commit 'eadb88fe37825d3f39400c68f2cdc950aec4e30e':
Fix a remaining View leak in InputMethodManager.
Change-Id: I0c53b76b279c625c79ecdfa22a031ad9eac3e317
2016-04-05 17:31:44 +00:00
Yohei Yukawa
eadb88fe37
Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev
...
am: e470fcf
* commit 'e470fcfeb001d52c4add58f8420709cb6db7e7c4':
Fix a remaining View leak in InputMethodManager.
Change-Id: I9f83e4de49c527d629091ffc6cf13297bdd6df3b
2016-04-05 17:28:32 +00:00