Yuncheol Heo
b03eef56ae
am a3820a32: am a566b462: Go to nap when receiving <Active Source> for the other devices.
...
* commit 'a3820a32f6c3843f390d36bb49df02bc64ca7be9':
Go to nap when receiving <Active Source> for the other devices.
2014-08-07 09:09:55 +00:00
Terry Heo
ae146bd38f
am 71289d85: am e2a42d17: TIF: Add system API \'isSingleSessionActive()\'
...
* commit '71289d85c65b911c8e96472b82ab3c1cbc0f1f49':
TIF: Add system API 'isSingleSessionActive()'
2014-08-07 09:09: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
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
f16e353840
am ca4d1bcd: am 2e59c148: Move image classes options from art to AndroidRuntime [frameworks/base]
...
* commit 'ca4d1bcd49186b4e15645f84af4d484eb1a910ce':
Move image classes options from art to AndroidRuntime [frameworks/base]
2014-08-07 06:51:09 +00:00
Brian Carlstrom
292c7ecd86
am 7cf44627: (-s ours) am 70705cac: Disable compilation based on vold.decrypt. [frameworks/base]
...
* commit '7cf446278ad75f776b3c2ecd214ec2f6a12b02f8':
Disable compilation based on vold.decrypt. [frameworks/base]
2014-08-07 06:51:05 +00:00
Brian Carlstrom
03760d65ab
am cfb39f8b: (-s ours) am 19571b5e: Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
...
* commit 'cfb39f8bddfb6f091902248c30ef3ab001eb2798':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
2014-08-07 06:44:03 +00:00
Alex Light
c9c663742c
am 3702180b: am 8f3ac7f8: resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp
...
* commit '3702180b2efa0958d52005c0333ee1abb1ebc097':
resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp
2014-08-07 06:36:13 +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
c59b7f45cb
am 3df7448f: am 6fd17d9b: Merge "Use message validator for sending message." into lmp-dev
...
* commit '3df7448f0bd89050e07747914a0fd19f3275a432':
Use message validator for sending message.
2014-08-07 05:33:22 +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 108166c749f0418d45f220419a9611c4afec1311)
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 4fd561637a173c7fa6a1d71e9115db1db90514ff)
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 f60d3a4702f6d00d7edb5d348c53b9b03ae16b76)
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
73eb3f201f
am 2b2e19fd: am 903f1840: Fix cross-user talk.
...
* commit '2b2e19fda1c8e6dcdebe30932e896b9d09ad0e33':
Fix cross-user talk.
2014-08-07 05:22:14 +00: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
2788d59ca1
am c907319c: am e208fb35: Merge "Rename FeatureAction into HdmiCecFeatureAction" into lmp-dev
...
* commit 'c907319c1e647405ae27a0374f202266d68c47ef':
Rename FeatureAction into HdmiCecFeatureAction
2014-08-07 05:10:54 +00:00
Matthew Williams
1dfea4ba56
am 50e2b3c0: am 5a293923: JobScheduler idle mode not being properly triggered
...
* commit '50e2b3c0362afe0fe572c8ef43164ab5a1e52033':
JobScheduler idle mode not being properly triggered
2014-08-07 05:10:49 +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
2d653a446f
am 7eae8b6f: am bd1c5d96: Merge "Common shade width across devices." into lmp-dev
...
* commit '7eae8b6f41c5d119b20629ba4d5e0e6d712379ec':
Common shade width across devices.
2014-08-07 04:02:19 +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
2402f3c54e
am a3f77fe8: am c9926974: Switch CaptivePortalLogin app to use theme like Settings UI.
...
* commit 'a3f77fe824b40ea15fb72ce3462dabad1acb12c4':
Switch CaptivePortalLogin app to use theme like Settings UI.
2014-08-07 03:02:24 +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
Jungshik Jang
90a92d3da1
am 09ae74da: am f3d00918: Merge "Rename HdmiCecDeviceInfo into HdmiDeviceInfo." into lmp-dev
...
* commit '09ae74da4d275309a53cd5752cb4107ec784898a':
Rename HdmiCecDeviceInfo into HdmiDeviceInfo.
2014-08-07 02:52:54 +00:00
Paul Jensen
6252918ee6
am 0a7b1640: am 4636b4af: Stop ConnectivityService from talking to netd about uncreated networks.
...
* commit '0a7b1640acdc0076673ffa47c2fbf9ac37ce92af':
Stop ConnectivityService from talking to netd about uncreated networks.
2014-08-07 02:52:49 +00:00
Paul Jensen
729c8bd5b8
am 9b7e7a30: am 5bfc639e: Merge "Flush DNS cache when routes change." into lmp-dev
...
* commit '9b7e7a30256908a904f05a6c5b9e56c580316e0c':
Flush DNS cache when routes change.
2014-08-07 02:52:41 +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
d454dfa7cb
am 3539fbed: am f98c63e9: Merge "Revert DNS cache flush command deletion from "Cleanup: Delete dead code."" into lmp-dev
...
* commit '3539fbed7a1eff62f4a8c150dce3e98f2e0be023':
Revert DNS cache flush command deletion from "Cleanup: Delete dead code."
2014-08-07 02:42:26 +00:00
Paul Jensen
444c776ed3
am 62857875: am 7289d65f: Merge "Add back in ACTION_NETWORK_CONDITIONS_MEASURED broadcast." into lmp-dev
...
* commit '62857875c495fcf9eda623aef44f6f7ae097c54f':
Add back in ACTION_NETWORK_CONDITIONS_MEASURED broadcast.
2014-08-07 02:42:22 +00:00
Paul Jensen
bbf8ea35d0
am d2ff5f51: am 776f1902: Remove dead CaptivePortalTracker.
...
* commit 'd2ff5f51338cc8d2683394e68901c016459c9c77':
Remove dead CaptivePortalTracker.
2014-08-07 02:42:18 +00:00
Paul Jensen
d0b81cb7ff
am 06ca1eb7: am 5f82440a: Merge "Use OkHTTP instead of my home-made HTTP, for network validation." into lmp-dev
...
* commit '06ca1eb7feb74f38ebaa155d7dfc31ee68353cda':
Use OkHTTP instead of my home-made HTTP, for network validation.
2014-08-07 02:42:11 +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
40d8201719
am 435cc61f: am 216fe6da: Merge "Fix NPE in device policy manager service." into lmp-dev
...
* commit '435cc61f8760f969eef21e29089f72bffe34e500':
Fix NPE in device policy manager service.
2014-08-07 02:16:18 +00:00