Ji-Hwan Lee
4bba00b592
am 1d0fc352: TIF: Handle setMainSession for TV input wrapper services
...
* commit '1d0fc352aa10c1f97c8ff03445ebd8e701e4eff7':
TIF: Handle setMainSession for TV input wrapper services
2014-08-07 10:13:02 +00:00
Ji-Hwan Lee
956afc2ba7
TIF: Handle setMainSession for TV input wrapper services
...
Bug: 15994065
Change-Id: I46b3c0a89be92036f2c3849a412075caf587ec5c
2014-08-07 10:05:30 +00:00
Esteban Talavera
8d5e98821c
am cc22fede: Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev
...
* commit 'cc22fede5a45c2702496a7dce41aeab51275c9f4':
Wipe only managed profile when max number of incorrect passwords exceeded
2014-08-07 10:04:17 +00:00
Robin Lee
e272aa9512
am e07e39b7: Disallow switching managed profile to foreground
...
* commit 'e07e39b75b8a25549ff9ab70f228e101727b4db2':
Disallow switching managed profile to foreground
2014-08-07 09:25:14 +00:00
Robin Lee
faa4b3cb06
Disallow switching managed profile to foreground
...
Another check in the ActivityManager to stop us from getting into an
invalid state by a fat-fingered 'am switch' etc.
@bug 16814252
Change-Id: Id65ab647d5a535cc2f965139a1b717cf65aa7e69
2014-08-07 10:15:45 +01:00
Yuncheol Heo
88f061d400
am b0e4ff34: Allow to use device\'s own physical address.
...
* commit 'b0e4ff34405ce270356f1975da845a408258e280':
Allow to use device's own physical address.
2014-08-07 09:10:51 +00:00
Yuncheol Heo
f6c73433ef
am a566b462: Go to nap when receiving <Active Source> for the other devices.
...
* commit 'a566b462221010df49304c39e172e8df454c1346':
Go to nap when receiving <Active Source> for the other devices.
2014-08-07 08:59:05 +00:00
Terry Heo
b2816936ac
am e2a42d17: TIF: Add system API \'isSingleSessionActive()\'
...
* commit 'e2a42d17504888dddde9b3c522f0a2de1af462ab':
TIF: Add system API 'isSingleSessionActive()'
2014-08-07 08:59:01 +00:00
Yuncheol Heo
7dea98f6f9
Allow to use device's own physical address.
...
- Fixed JavaDoc.
Change-Id: I6fdbf6596b5f2e41a238b36e128ba0889725c813
2014-08-07 17:58:59 +09:00
Yuncheol Heo
2849b7ccd1
Go to nap when receiving <Active Source> for the other devices.
...
- Previously, it went to sleep when it got <Active Source>, but this
causes the other side-effects like can't-wake-up when changing to HDMI
port directly.
Bug: 15578870
Change-Id: I0ca5bd2372c9e5e7446592d66483900eeba75500
2014-08-07 17:30:08 +09:00
Terry Heo
df9f0a321e
TIF: Add system API 'isSingleSessionActive()'
...
Bug: 16498558
Change-Id: I4f815f431051dbf786216d2b04e9737be451a508
2014-08-07 08:07:17 +00:00
Brian Carlstrom
fb5a770c9f
am 2e59c148: Move image classes options from art to AndroidRuntime [frameworks/base]
...
* commit '2e59c1487263b9295b21c7adb9c19c58007a4578':
Move image classes options from art to AndroidRuntime [frameworks/base]
2014-08-07 06:25:22 +00:00
Brian Carlstrom
540bf5555b
am 70705cac: Disable compilation based on vold.decrypt. [frameworks/base]
...
* commit '70705cac115aa5b2694c18efa8b8a1fd38ab8401':
Disable compilation based on vold.decrypt. [frameworks/base]
2014-08-07 06:25:17 +00:00
Brian Carlstrom
6c0bb00acf
am 19571b5e: Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
...
* commit '19571b5e3484d8b50495af58972f67dfee2d07dd':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
2014-08-07 06:25:12 +00:00
Alex Light
b6837432e2
am 8f3ac7f8: resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp
...
* commit '8f3ac7f82c0c2a8515a7177d8db05bd0a690f936':
resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp
2014-08-07 06:25:07 +00:00
Jungshik Jang
b09988cae2
am 6fd17d9b: Merge "Use message validator for sending message." into lmp-dev
...
* commit '6fd17d9b3300c865acfba94bdb9fe3b0c1f3b202':
Use message validator for sending message.
2014-08-07 05:26:25 +00:00
Brian Carlstrom
ce5bbbea08
Move image classes options from art to AndroidRuntime [frameworks/base]
...
Bug: 15165413
(cherry picked from commit 108166c749 )
Change-Id: Ib0d638ac3ca6668a5be04cdbdfd46740dabeceaa
2014-08-06 22:25:01 -07:00
Brian Carlstrom
0d8fb01963
Disable compilation based on vold.decrypt. [frameworks/base]
...
Bug: 15165413
(cherry picked from commit 4fd561637a )
Change-Id: I2a13b63f9d4a7ffd69a8d21666c6dce84739c6ed
2014-08-06 22:25:01 -07:00
Brian Carlstrom
3fbfbb4ade
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
(cherry picked from commit f60d3a4702 )
Change-Id: I293c81ba817e9abbf9c05b3fb554ef2f0ad0c4ed
2014-08-06 22:25:00 -07:00
Alex Light
a25dc2bbe7
resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp
...
Change-Id: I1fe0e64d2069b7424014bd3ff0bf6f80b439220d
(cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)
2014-08-06 22:25:00 -07:00
Svetoslav
d800c9f002
am 903f1840: Fix cross-user talk.
...
* commit '903f18404f2c4994948bc27774b6875be274556a':
Fix cross-user talk.
2014-08-07 05:17:55 +00:00
Svetoslav
985e566cec
Fix cross-user talk.
...
An app can access widgets hosted or provided by its uid and package.
Access is also allowed if the caller has the bind app widgets permission
but this caller can be in the wrong user. Now the caller should not
only have the bind app widget permission but also be in the same user
as the host or the provider of the widget.
bug:16834230
Change-Id: I5ddb6309f63f2b4ba95360446c2b9584350fb66f
2014-08-07 05:14:36 +00:00
Jungshik Jang
75170afdb0
am e208fb35: Merge "Rename FeatureAction into HdmiCecFeatureAction" into lmp-dev
...
* commit 'e208fb3548f7c85f5888d0b20791cfb9d5fab07d':
Rename FeatureAction into HdmiCecFeatureAction
2014-08-07 05:05:32 +00:00
Matthew Williams
1695e8d97b
am 5a293923: JobScheduler idle mode not being properly triggered
...
* commit '5a293923a137544ae5a82a823d88bda5caa73c5a':
JobScheduler idle mode not being properly triggered
2014-08-07 04:57:37 +00:00
Matthew Williams
be0c417539
JobScheduler idle mode not being properly triggered
...
Issue with how the pending intent was being created -
the component name being explicitly set on the intent somehow
caused the intent to not be delivered.
Fix: no longer set the component name on the intent.
BUG: 16798118
Change-Id: I86b08b2a47067dc9b8da8b85450bc338e0826aca
2014-08-07 04:50:47 +00:00
John Spurlock
4950aecf67
am bd1c5d96: Merge "Common shade width across devices." into lmp-dev
...
* commit 'bd1c5d9646450878541179cfbed62b85d6f44f28':
Common shade width across devices.
2014-08-07 03:58:41 +00:00
Paul Jensen
e21e71a3ae
am c9926974: Switch CaptivePortalLogin app to use theme like Settings UI.
...
* commit 'c99269745257bc6b6a20420280e6b12085365803':
Switch CaptivePortalLogin app to use theme like Settings UI.
2014-08-07 02:58:33 +00:00
Paul Jensen
8f333f1922
Switch CaptivePortalLogin app to use theme like Settings UI.
...
The theme is switched to Theme.Material.Settings. The progress bar
window feature is not supported in Material (b/16652978) so I added
a progress bar to the layout. The Theme.Material.Setting's accent
color is set such that ProgressBars are indistinguishable, so accent
color is reset back to the parent's setting.
bug:15409354
Change-Id: Ic2862b8439be8591ec426f3d4dffad72179b2539
2014-08-07 02:49:24 +00:00
Jungshik Jang
eb073ae054
am f3d00918: Merge "Rename HdmiCecDeviceInfo into HdmiDeviceInfo." into lmp-dev
...
* commit 'f3d00918200dd500e11b05e44e9722925aab0662':
Rename HdmiCecDeviceInfo into HdmiDeviceInfo.
2014-08-07 02:48:05 +00:00
Paul Jensen
d179701364
am 4636b4af: Stop ConnectivityService from talking to netd about uncreated networks.
...
* commit '4636b4afd5b8f4bc48ab9c477ea5a648026c7df4':
Stop ConnectivityService from talking to netd about uncreated networks.
2014-08-07 02:48:00 +00:00
Paul Jensen
87bf04db1a
am 5bfc639e: Merge "Flush DNS cache when routes change." into lmp-dev
...
* commit '5bfc639e8a835b6c1cb8d1ae30e9191bde6dd78a':
Flush DNS cache when routes change.
2014-08-07 02:47:56 +00:00
Paul Jensen
eec75412a9
Stop ConnectivityService from talking to netd about uncreated networks.
...
This avoids logged netd errors that are red-herrings.
bug:16667349
Change-Id: I5d6f1681f1d38dab0af4c535573a0c45c0216603
2014-08-07 02:44:51 +00:00
Paul Jensen
d605503afc
am f98c63e9: Merge "Revert DNS cache flush command deletion from "Cleanup: Delete dead code."" into lmp-dev
...
* commit 'f98c63e998b80a0c64b33fe3a1047ee8f8a5809e':
Revert DNS cache flush command deletion from "Cleanup: Delete dead code."
2014-08-07 02:37:59 +00:00
Paul Jensen
f3db4efec1
am 7289d65f: Merge "Add back in ACTION_NETWORK_CONDITIONS_MEASURED broadcast." into lmp-dev
...
* commit '7289d65f5901b2c0aafb3ac65b7238072f6c808a':
Add back in ACTION_NETWORK_CONDITIONS_MEASURED broadcast.
2014-08-07 02:37:54 +00:00
Paul Jensen
75e7c928bf
am 776f1902: Remove dead CaptivePortalTracker.
...
* commit '776f19026b52a9bad49c4313c68d8c6e69db9502':
Remove dead CaptivePortalTracker.
2014-08-07 02:37:50 +00:00
Paul Jensen
0001ee8f0e
am 5f82440a: Merge "Use OkHTTP instead of my home-made HTTP, for network validation." into lmp-dev
...
* commit '5f82440aff342f75edae15964d3b44b3c32620ac':
Use OkHTTP instead of my home-made HTTP, for network validation.
2014-08-07 02:37:46 +00:00
Paul Jensen
ab14df37ab
Remove dead CaptivePortalTracker.
...
Captive portals are now detected by the NetworkMonitor.
Change-Id: Ibfb04bf83b1028231397a577468f110d7ab1dc06
2014-08-07 02:32:54 +00:00
Svetoslav
2e826f5c90
am 216fe6da: Merge "Fix NPE in device policy manager service." into lmp-dev
...
* commit '216fe6da76039a1db65638438eb41375ed6a33e5':
Fix NPE in device policy manager service.
2014-08-07 02:12:02 +00:00
Jinsuk Kim
e2688de329
am 5abc363b: Merge "CEC: Hide CEC devices behind non-CEC switch" into lmp-dev
...
* commit '5abc363b58d21a87d76994a9882cd90fe2df667b':
CEC: Hide CEC devices behind non-CEC switch
2014-08-07 01:44:45 +00:00
Alan Viverette
c175ea474b
am 37f56e55: Update branding colors
...
* commit '37f56e55592be690c031090eed3e9e32adb3c1af':
Update branding colors
2014-08-07 01:29:28 +00:00
Alan Viverette
ec9d464a59
Update branding colors
...
BUG: 16845793
BUG: 16851916
Change-Id: I79a15752b5dda8f3c9f159826c61e3d2a6c8bd48
2014-08-07 01:13:23 +00:00
Alan Viverette
c1c47f7e02
am cb0fc1e5: Preserve surface insets when view layout is updated
...
* commit 'cb0fc1e5a6b7e516eb7513fda09def253ba36032':
Preserve surface insets when view layout is updated
2014-08-07 01:07:48 +00:00
Svet Ganov
de7009407a
am 7efdcd46: Merge "Fix regression in remote views." into lmp-dev
...
* commit '7efdcd461e99a5e0fd410421bfb8cfe718a5bb98':
Fix regression in remote views.
2014-08-07 01:07:44 +00:00
Alan Viverette
dbed893ba8
Preserve surface insets when view layout is updated
...
Also makes canvas save & restore in threaded renderer a little safer.
BUG: 16654228
Change-Id: Ie0d49450ed408cffd0b859c08e524b6f904c77ca
2014-08-07 01:01:17 +00:00
Adam Lesinski
38716de186
am 255b263c: Merge "Modify base Configuration used for aapt dump badging" into lmp-dev
...
* commit '255b263c9b37a460a38a76005513e9d9698d1d59':
Modify base Configuration used for aapt dump badging
2014-08-07 00:55:23 +00:00
Youngsang Cho
15bf9066c2
am 494c1d61: Make caption setting consistent across sessions
...
* commit '494c1d6193d7579f00b5799616f81df4e5cc1f4b':
Make caption setting consistent across sessions
2014-08-07 00:55:18 +00:00
Youngsang Cho
5caf1e8dda
Make caption setting consistent across sessions
...
Change-Id: I7cb8ab109188b9f78cceb1025339bce98c776052
2014-08-07 00:48:50 +00:00
Adam Powell
611a157cd5
am f735b695: Have TextView editors use the Menu context for action mode icons
...
* commit 'f735b695854049eafd95321d6539905cf9e053fc':
Have TextView editors use the Menu context for action mode icons
2014-08-07 00:41:12 +00:00
Adam Powell
098e7fb587
Have TextView editors use the Menu context for action mode icons
...
Using the TextView's context instead when resolving these icons from
the theme causes issues if a dark action bar theme is in use.
Bug 16686041
Change-Id: I44cb4a83516d8610103b6ebaf604860b67ac84dd
2014-08-06 17:35:17 -07:00
Jorim Jaggi
45751c1150
am 50d17095: Merge "Fix hints for tablet lockscreen." into lmp-dev
...
* commit '50d17095a476d5196121eeddb5b4b0ea73e87df1':
Fix hints for tablet lockscreen.
2014-08-07 00:32:58 +00:00