vandwalle
7e553a06a0
Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839
...
automerge: 0a22d43
* commit '0a22d43c9143475c889ce54f0de6261e8857ab9d':
aggressively blacklist WifiConfiguration for the purpose of switching network
2015-01-29 05:00:44 +00:00
vandwalle
0a22d43c91
Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev
...
automerge: d169839
* commit 'd1698393e71f4792f98156bb963e5876bc8c2eb0':
aggressively blacklist WifiConfiguration for the purpose of switching network
2015-01-29 04:57:00 +00:00
vandwalle
d1698393e7
Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev
2015-01-29 04:50:44 +00:00
Svetoslav
b6f10982ac
Merge "AccessibilityNodeInfo refresh returns a stale state."
2015-01-29 02:54:22 +00:00
Stuart Scott
d31cafb369
am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236
...
automerge: cf8ae79
* commit 'cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b':
Change getDeviceId to take phoneId.
2015-01-29 02:13:35 +00:00
Stuart Scott
cf8ae79ef2
am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236
...
* commit '8d702000a7291068e639a9954e03c36d66144449':
Change getDeviceId to take phoneId.
2015-01-29 02:06:51 +00:00
Stuart Scott
8d702000a7
Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
...
automerge: f4e5236
* commit 'f4e52360613d20dc8176ce8a37cb05ad904fad0d':
Change getDeviceId to take phoneId.
2015-01-29 01:58:53 +00:00
Stuart Scott
f4e5236061
Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
2015-01-29 01:55:47 +00:00
Lajos Molnar
4fb442617c
ImageReader: add support for compatible flexYUV buffers
...
Bug: 17906609
Change-Id: Ia21aff632b9a92f4e391b3917a7774af46fd81a0
2015-01-28 17:34:23 -08:00
Dirk Dougherty
448080dcbc
am 820d5c52: am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. automerge: 3f9d57d automerge: e0b5a38
...
automerge: 1cbe026
* commit '1cbe026b932fa7820ab1ab27833a4a1bf1ff3ebf':
Doc change: Update Ads terms language.
2015-01-29 01:24:42 +00:00
Dirk Dougherty
1cbe026b93
am 820d5c52: am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. automerge: 3f9d57d automerge: e0b5a38
...
* commit '820d5c52b7e65bffeb4291887f5a1011e7ce971e':
Doc change: Update Ads terms language.
2015-01-29 01:11:14 +00:00
Dirk Dougherty
820d5c52b7
am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. automerge: 3f9d57d
...
automerge: e0b5a38
* commit 'e0b5a3812269228070dabb792bc501ae435338bb':
Doc change: Update Ads terms language.
2015-01-29 01:01:32 +00:00
Chris Craik
1f08f377a4
Merge "Move more GL state management to RenderState and its directory"
2015-01-29 00:55:07 +00:00
Soonil Nagarkar
55fc40cbb7
Fix FusionEngine so it isn't confused by location providers enabling/disabling.
...
Bug: 18900529
Change-Id: I80ebf9e0482148897eb943b44bf711577b6dcf7a
2015-01-28 16:55:01 -08:00
Dirk Dougherty
e0b5a38122
am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language.
...
automerge: 3f9d57d
* commit '3f9d57dbe896d56e0eae381aa3e70ac93d755f24':
Doc change: Update Ads terms language.
2015-01-29 00:54:45 +00:00
Jae Seo
2920f0f510
am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the session is already released
...
automerge: 4980163
* commit '49801634e46bdba633aba6f7944f0417496b38ce':
TIF: Do not call session callbacks when the session is already released
2015-01-29 00:50:04 +00:00
Jae Seo
49801634e4
am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the session is already released
...
* commit '4b1e5814d18dae8f2581cf702da4b4e1de0c3eb4':
TIF: Do not call session callbacks when the session is already released
2015-01-29 00:46:25 +00:00
Svetoslav
5738fec00d
AccessibilityNodeInfo refresh returns a stale state.
...
AccessibilityNodeInfo refresh was getting the latest cached
state but this is not good enough as an accessibility service
can execute an action on the node and then refresh it to get
the new state.
bug:16954787
Change-Id: I004b4987b8dc423a2ab7031a4fbfe64365ddd7fe
2015-01-28 16:44:05 -08:00
Jae Seo
4b1e5814d1
am 71191442: TIF: Do not call session callbacks when the session is already released
...
* commit '711914421896ad15ab3c944c3adc838ac67cf2a6':
TIF: Do not call session callbacks when the session is already released
2015-01-29 00:33:29 +00:00
Chris Craik
96a5c4c7ba
Move more GL state management to RenderState and its directory
...
Change-Id: Ic68584e1c08dc64be2ad43450cb6caa1de834fdc
2015-01-28 16:32:39 -08:00
Dirk Dougherty
3f9d57dbe8
am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language.
...
* commit '8b1ad8e4d148b70e31d675515e8ad24ca3d12169':
Doc change: Update Ads terms language.
2015-01-29 00:30:37 +00:00
Dirk Dougherty
8b1ad8e4d1
am 49738792: Doc change: Update Ads terms language.
...
* commit '497387928d53cca060c3f43b3a9f5c7834564333':
Doc change: Update Ads terms language.
2015-01-29 00:24:39 +00:00
Dirk Dougherty
497387928d
Doc change: Update Ads terms language.
...
Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
2015-01-29 00:16:25 +00:00
Alan Viverette
7dbc3bfdd9
Clear accessibility focus when the window loses visibility
...
AccessibilityInteractionController checks window visibility during focus
search and when performing an action, which prevents the framework from
clearing focus when windows lose visibility. This change ensures that
focus will already have been cleared, which matches the behavior of the
other properties checked during focus search (view detachment and view
visibility).
Bug: 19169643
Change-Id: I795ed27ce8dfb7ecb1462943c81c5b14973a8d7a
2015-01-28 16:14:36 -08:00
Jae Seo
7119144218
TIF: Do not call session callbacks when the session is already released
...
Bug: 19146382
Change-Id: I5592d4bf033478e5e5e1013bd2ad5ea572df44dd
2015-01-28 15:50:08 -08:00
Eino-Ville Talvala
3537112124
am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21
...
automerge: 745d45e
* commit '745d45e0c02588762cc05d7bf3a6f5542830a987':
Camera2 legacy: Do not advertise NV21 support.
2015-01-28 23:32:50 +00:00
Eino-Ville Talvala
745d45e0c0
am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21
...
* commit '06b1014cf28431706d42219549170896bd581a29':
Camera2 legacy: Do not advertise NV21 support.
2015-01-28 23:29:23 +00:00
Eino-Ville Talvala
06b1014cf2
Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev
...
automerge: a17ab21
* commit 'a17ab21d4c81ecc80b00b14fe56ce721b4e757ae':
Camera2 legacy: Do not advertise NV21 support.
2015-01-28 23:22:56 +00:00
Eino-Ville Talvala
a17ab21d4c
Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev
2015-01-28 23:20:01 +00:00
Dianne Hackborn
8bd95f1623
Introduce new MNC API version.
...
Change-Id: Ib40822e82ea389092727dfc1f2f9ada5d04f2e87
2015-01-28 15:08:52 -08:00
Fyodor Kupolov
0e8f037ded
Merge "Added primaryUserOnly attribute for activities"
2015-01-28 22:52:19 +00:00
xinhe
7cfb00fb94
am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1
...
automerge: 5e51c21
* commit '5e51c21943a4e9c0096acbaee5f923e9e0297f25':
Sprint: MMS cannot be sent in the UK
2015-01-28 21:56:50 +00:00
xinhe
5e51c21943
am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1
...
* commit '93487e286e6bfa434fb092c6276d96b40e5d62c4':
Sprint: MMS cannot be sent in the UK
2015-01-28 21:53:34 +00:00
xinhe
93487e286e
Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev
...
automerge: fc921d1
* commit 'fc921d19b6d6d26f3b0147ba9c1ee96298e6a17c':
Sprint: MMS cannot be sent in the UK
2015-01-28 21:45:25 +00:00
xinhe
fc921d19b6
Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev
2015-01-28 21:42:15 +00:00
Jose Lima
43181fb72d
am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973
...
automerge: 485f6a6
* commit '485f6a60e0182767d57a5ab08d6438124a69439e':
Fix crash caused by disabling the Options panel on TVs
2015-01-28 21:32:37 +00:00
Leon Scroggins III
e469fcddbc
am c7109115: am cefcd81b: am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 automerge: 4c6ace6
...
automerge: 1334d5c
* commit '1334d5cfb4e6bd2fca95a8ca2d5bb583a4ef2923':
2015-01-28 21:31:13 +00:00
Jose Lima
485f6a60e0
am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973
...
* commit '4a40f7cc90d8f908527d2cfff32376ee51259250':
Fix crash caused by disabling the Options panel on TVs
2015-01-28 21:27:33 +00:00
Leon Scroggins III
1334d5cfb4
am c7109115: am cefcd81b: am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 automerge: 4c6ace6
...
* commit 'c71091151636f8276c4d1bffc75b66f90a36c774':
2015-01-28 21:27:15 +00:00
Alan Viverette
3667dea407
Merge "Move drawable out of inset state, only store constant state"
2015-01-28 21:14:42 +00:00
Stuart Scott
d456ec4be1
Change getDeviceId to take phoneId.
...
bug:18827144
Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5
2015-01-28 13:06:12 -08:00
Jose Lima
4a40f7cc90
Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
...
automerge: 1f81973
* commit '1f81973e7d33f2a3f4b0a0e232854283f0f18030':
Fix crash caused by disabling the Options panel on TVs
2015-01-28 20:59:05 +00:00
Eino-Ville Talvala
ccf6e88eec
Camera2 legacy: Do not advertise NV21 support.
...
Also reduce logging somewhat for common scenarios.
Bug: 19161738
Change-Id: If96ed7d2bac0229159564072d7969d7bea3fae27
2015-01-28 12:57:56 -08:00
Jose Lima
1f81973e7d
Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
2015-01-28 20:55:52 +00:00
RoboErik
c911612602
Fix build
...
Reran make update-api to generate the new system-current changes that
were enabled.
Change-Id: I98830fe1bc058ea97c99537bf8d64908467cdf67
2015-01-28 11:56:01 -08:00
Leon Scroggins III
c710911516
am cefcd81b: am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 automerge: 4c6ace6
...
* commit 'cefcd81bdb47ca3196fe487e684880d70ff8073c':
2015-01-28 19:13:55 +00:00
Leon Scroggins III
cefcd81bdb
am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13
...
automerge: 4c6ace6
* commit '4c6ace6fd683133a2d36e4bf9cb48491055e8d5e':
2015-01-28 19:09:08 +00:00
RoboErik
66df850de2
Merge "Add getMediaItem API to MediaBrowser"
2015-01-28 18:52:41 +00:00
Jose Lima
bd769a15ab
Fix crash caused by disabling the Options panel on TVs
...
Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.
Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
2015-01-28 10:46:39 -08:00
xinhe
6620b4273e
Sprint: MMS cannot be sent in the UK
...
This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too.
Bug:18241756
Change-Id: Icec10c88834151f5e35e38db93af36d7f40890fd
2015-01-28 10:40:27 -08:00
