Esteban Talavera
119bea6460
am 57d9b9c5: am 4835644c: am 14dcf0ff: Merge "Revert API constants to previous value to match hardcoded value in google3 apps" into lmp-dev
...
* commit '57d9b9c5d67f64f94071731839524fe6b7308558':
Revert API constants to previous value to match hardcoded value in google3 apps
2014-08-26 16:27:28 +00:00
Esteban Talavera
1a4b59960b
am 4835644c: am 14dcf0ff: Merge "Revert API constants to previous value to match hardcoded value in google3 apps" into lmp-dev
...
* commit '4835644c3bff5b0906789a746a14b6b24f3d375f':
Revert API constants to previous value to match hardcoded value in google3 apps
2014-08-26 16:17:40 +00:00
Esteban Talavera
fbb28dfb95
Revert API constants to previous value to match hardcoded value in google3 apps
...
Revert value of DevicePolicyManager constants that were hardcoded in dmagent. See previous change I6f60a43fe23526cfe855d81015feb759cf643926.
Bug: 17275391,17005622
Change-Id: I606b010eb0399f7b34b59c99f96549949410bafc
2014-08-26 15:38:44 +01:00
Jungshik Jang
9d5217b05b
am 30750a86: am a707633d: am 25d6a1e6: Fix several bugs in HdmiControlService.
...
* commit '30750a8653b5849423500ab142084b0e7e72b8af':
Fix several bugs in HdmiControlService.
2014-08-26 11:39:09 +00:00
Jungshik Jang
eecb0a1a0a
am a707633d: am 25d6a1e6: Fix several bugs in HdmiControlService.
...
* commit 'a707633db594b85604a2bddb0cfac333232ce0ad':
Fix several bugs in HdmiControlService.
2014-08-26 11:29:02 +00:00
Dan Sandler
532d710d27
am e725ff74: am d25fdb22: am 9255b9f4: Allow listeners to fetch current notifications by key.
...
* commit 'e725ff74f3bfdddfda85a6f7fbf2345b8bdfed5e':
Allow listeners to fetch current notifications by key.
2014-08-26 10:10:11 +00:00
Adam Powell
06c21fdea2
am ae87f787: am f0b3161f: am 44c81774: Merge "Add state save/restore for Toolbar" into lmp-dev
...
* commit 'ae87f7872a61fe6d14f583ac0caaa9ee7fadbabb':
Add state save/restore for Toolbar
2014-08-26 10:10:01 +00:00
Robert Greenwalt
9b58a7f020
am 8475d034: am 79338c75: am e252f526: Merge "Update VPN whitelist/blacklist api docs." into lmp-dev
...
* commit '8475d034c5deda0b3d1a22bbd0074e4caaeb34ff':
Update VPN whitelist/blacklist api docs.
2014-08-26 10:09:57 +00:00
Craig Mautner
21257b205b
am 1a8416bf: am 7e587f00: am dbbb7951: Merge "Update API per council requests" into lmp-dev
...
* commit '1a8416bf597a287d8773eac2255c87e606cf853b':
Update API per council requests
2014-08-26 10:09:45 +00:00
Chris Craik
2302ab0182
am 9aa0af14: am b0640084: am 6210c6dc: Merge "Create z reordering boundaries around dispatchDraw" into lmp-dev
...
* commit '9aa0af1499694fce9d9404130579c540125072ac':
Create z reordering boundaries around dispatchDraw
2014-08-26 10:09:36 +00:00
Dianne Hackborn
3d605c6f98
am d75419cf: am 2e4f0834: am 8db0a171: Merge "Fix issue #16366571 : UIDs for work and normal Chrome processes are the same" into lmp-dev
...
* commit 'd75419cfd776c6504f024e4337e846f0aafbf473':
Fix issue #16366571 : UIDs for work and normal Chrome processes are the same
2014-08-26 10:09:31 +00:00
Nancy Chen
d7b43eae63
am ff0847ce: am 2ac6146c: am f9317703: Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev
...
* commit 'ff0847ced3191ba019b41524855646335d717f62':
API review PhoneManager -> TelecommManager. Rename methods (6/6)
2014-08-26 10:09:02 +00:00
Adam Lesinski
91c37eeed5
am 3c02cb6c: am 114978fd: am 874d4c00: Merge "PM: Load all splits when parsing an app manifest" into lmp-dev
...
* commit '3c02cb6ccd684a97f3dd74bf523cbb84f00f9bad':
PM: Load all splits when parsing an app manifest
2014-08-26 10:08:18 +00:00
Paul Jensen
837c32913a
am 19d42455: am f6479a6e: am fa1893b4: Merge "Remove captive portal sign-in actions." into lmp-dev
...
* commit '19d4245533ad2c9c0e03a7b9f553694661550082':
Remove captive portal sign-in actions.
2014-08-26 10:07:37 +00:00
Jungshik Jang
339227da7c
Fix several bugs in HdmiControlService.
...
1. Fix HdmniLogger null pointer exception
2. Should check arc enabled port for arc requests
3. Disallow ARC action coming from indirect AVR device.
4. Check original opcode of feature action
5. Add bitmasking to all parameters of cec message.
Bug: 17243701, Bug: 17238394, Bug: 17241401
Change-Id: Iff0da78b0de9a29fb00e683c261528e0baea66af
2014-08-26 14:13:57 +09:00
Dan Sandler
bea0a29c25
am d25fdb22: am 9255b9f4: Allow listeners to fetch current notifications by key.
...
* commit 'd25fdb22b80bfc987423e65d1a4da933229ea2c2':
Allow listeners to fetch current notifications by key.
2014-08-26 05:07:58 +00:00
Adam Powell
94dab8cf72
am f0b3161f: am 44c81774: Merge "Add state save/restore for Toolbar" into lmp-dev
...
* commit 'f0b3161f44379e2c11b9e3108b4dd2f2e54a8b00':
Add state save/restore for Toolbar
2014-08-26 04:56:59 +00:00
Robert Greenwalt
2738aafa20
am 79338c75: am e252f526: Merge "Update VPN whitelist/blacklist api docs." into lmp-dev
...
* commit '79338c75223dfd62f867193888ccccad082375e9':
Update VPN whitelist/blacklist api docs.
2014-08-26 04:56:50 +00:00
Craig Mautner
ea3b4f84bd
am 7e587f00: am dbbb7951: Merge "Update API per council requests" into lmp-dev
...
* commit '7e587f00bda01bd0cc814385c863b56e641f0670':
Update API per council requests
2014-08-26 04:56:25 +00:00
Chris Craik
c53e7c8578
am b0640084: am 6210c6dc: Merge "Create z reordering boundaries around dispatchDraw" into lmp-dev
...
* commit 'b06400847cdfae6da8d3d4d5b52e2ff29d06cb7a':
Create z reordering boundaries around dispatchDraw
2014-08-26 04:56:01 +00:00
Dianne Hackborn
e98a423e40
am 2e4f0834: am 8db0a171: Merge "Fix issue #16366571 : UIDs for work and normal Chrome processes are the same" into lmp-dev
...
* commit '2e4f0834b4630484fa42d2ab6f0c59752d845a22':
Fix issue #16366571 : UIDs for work and normal Chrome processes are the same
2014-08-26 04:55:56 +00:00
Nancy Chen
bca396d5e1
am 2ac6146c: am f9317703: Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev
...
* commit '2ac6146c31e2f4798b66b7fa2abdb8e853592686':
API review PhoneManager -> TelecommManager. Rename methods (6/6)
2014-08-26 04:55:24 +00:00
Adam Lesinski
6f858c1496
am 114978fd: am 874d4c00: Merge "PM: Load all splits when parsing an app manifest" into lmp-dev
...
* commit '114978fd6aac8015306e7dc54e4d7accd39d7cf6':
PM: Load all splits when parsing an app manifest
2014-08-26 04:53:53 +00:00
Paul Jensen
105ea0bd9d
am f6479a6e: am fa1893b4: Merge "Remove captive portal sign-in actions." into lmp-dev
...
* commit 'f6479a6ed5b3e7438a81eca4912f744eb2d6876a':
Remove captive portal sign-in actions.
2014-08-26 04:52:34 +00:00
Dan Sandler
ea75fddbb4
Allow listeners to fetch current notifications by key.
...
Bug: 16574195
Change-Id: I269dbcc7fc8912d84229f6a3d950b0015625ae7a
2014-08-26 04:24:10 +00:00
Adam Powell
b79a70ab71
Merge "Add state save/restore for Toolbar" into lmp-dev
2014-08-26 01:29:15 +00:00
Adam Powell
31c91c8179
Add state save/restore for Toolbar
...
Save and restore the menu state for Toolbars. This will make sure that
we remember expanded action views and opened overflow menus across
state save/restore.
Remove an extra event post involved in the initial population of
action bar menus. Apparently at some point an extra level of this was
added that isn't necessary. Process any pending menu invalidations
immediately when we perform window state restoration. This makes sure
individual bits of state in action views, etc. are also restored
properly.
Bug 12005461
Change-Id: Icf905698576b11a59641bc319adc62300857906f
2014-08-25 18:25:54 -07:00
Robert Greenwalt
ad3fc40737
Merge "Update VPN whitelist/blacklist api docs." into lmp-dev
2014-08-26 00:58:51 +00:00
Robert Greenwalt
fc4f721a87
Update VPN whitelist/blacklist api docs.
...
Addressing what happens to unwhitelisted or blacklisted apps.
bug:17206162
Change-Id: I0b863946de277e6528675cc5412267a03f7b6841
2014-08-25 17:55:28 -07:00
Craig Mautner
1adbf22861
Merge "Update API per council requests" into lmp-dev
2014-08-26 00:00:18 +00:00
Chris Craik
366b4234ea
Merge "Create z reordering boundaries around dispatchDraw" into lmp-dev
2014-08-25 23:26:19 +00:00
Dianne Hackborn
4cce1de9fe
Merge "Fix issue #16366571 : UIDs for work and normal Chrome processes are the same" into lmp-dev
2014-08-25 23:21:48 +00:00
Chris Craik
8afd0f245c
Create z reordering boundaries around dispatchDraw
...
bug:16012254
This means rendernodes with a Z will no longer be drawn at the end of
their parent's DisplayList, but at the end of the associated reorder
region (DisplayListData::Chunk).
Change-Id: Ia033fee9d9a4db567b2a8d5e90fc57a4d0a64544
2014-08-25 15:35:40 -07:00
Nancy Chen
e4b1d57dfd
Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev
2014-08-25 22:24:09 +00:00
Adam Lesinski
6b2416492e
Merge "PM: Load all splits when parsing an app manifest" into lmp-dev
2014-08-25 21:41:22 +00:00
Craig Mautner
3b2cd1d59f
Update API per council requests
...
launchTaskBehindBackgroundAnimation => launchTaskBehindTargetAnimation
visibilityMode => transitionVisiblityMode
makeLaunchTaskBehindAnimation => makeTaskLaunchBehind
launch_task_behind_background = launch_task_behind_target
Fixes bug 16958544.
Change-Id: I3b7c791fc0671b8071a5377cf6fa878bd5861f70
2014-08-25 14:25:54 -07:00
Paul Jensen
177cd38b00
Merge "Remove captive portal sign-in actions." into lmp-dev
2014-08-25 18:52:32 +00:00
Svet Ganov
8907a0eebe
am 3de47446: am 43e9ef49: am bd394c7a: Merge "RemoteViews service not unbound." into lmp-dev
...
* commit '3de4744625297a0d67267725d84518685d67efd4':
RemoteViews service not unbound.
2014-08-25 18:26:48 +00:00
Svet Ganov
c14c828fcd
am 43e9ef49: am bd394c7a: Merge "RemoteViews service not unbound." into lmp-dev
...
* commit '43e9ef4959f1dda00bfcb14a18afa7684ba2b485':
RemoteViews service not unbound.
2014-08-25 18:09:58 +00:00
Sandeep Siddhartha
af9bf968ce
am c9c598fe: am 61ae93d3: am 8da4d313: Remove the old API for creating hotword detector
...
* commit 'c9c598fed9065be5127d1b66b6d4774ead6d114e':
Remove the old API for creating hotword detector
2014-08-25 18:07:43 +00:00
Sandeep Siddhartha
d1e0b3d74a
am 61ae93d3: am 8da4d313: Remove the old API for creating hotword detector
...
* commit '61ae93d3231f70e660b50e431ab981ad3dd3a495':
Remove the old API for creating hotword detector
2014-08-25 17:57:32 +00:00
Nancy Chen
0eb1e402c7
API review PhoneManager -> TelecommManager. Rename methods (6/6)
...
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both
Bug: 16960458
Change-Id: I7d573e27ed093f2ddb7849703cc62f9916835393
2014-08-25 10:50:44 -07:00
Svet Ganov
f2a778683d
Merge "RemoteViews service not unbound." into lmp-dev
2014-08-25 17:48:06 +00:00
Sandeep Siddhartha
07b4a6f42d
Remove the old API for creating hotword detector
...
To be submitted only when the prebuilts have been updated
Change-Id: I7136b6a492610e4673f005b2d1682ce90ddb43a5
2014-08-25 10:34:07 -07:00
Sandeep Siddhartha
7395be6829
am c95d61e1: am b6943e7b: am fe3a5e88: Merge "Fix conversion of locale from BCP47 language tag" into lmp-dev
...
* commit 'c95d61e15c33519225e2d89af58aeb9843776e2f':
Fix conversion of locale from BCP47 language tag
2014-08-25 16:58:26 +00:00
Sandeep Siddhartha
dbffa09f63
am b6943e7b: am fe3a5e88: Merge "Fix conversion of locale from BCP47 language tag" into lmp-dev
...
* commit 'b6943e7be6ce533d490009a5efe1264e1fd9ce46':
Fix conversion of locale from BCP47 language tag
2014-08-25 16:45:21 +00:00
Sandeep Siddhartha
4b4d7efe52
Merge "Fix conversion of locale from BCP47 language tag" into lmp-dev
2014-08-25 16:18:55 +00:00
Wei Wang
ba48c1d41e
am ae31bcd3: am 549f92b1: am 3952e39c: Merge "Fix API council review comments. Also hide certain APIs(1/3)." into lmp-dev
...
* commit 'ae31bcd330d731f38e1eb7c4d82a6e6500376123':
Fix API council review comments. Also hide certain APIs(1/3).
2014-08-25 08:25:14 +00:00
Jeff Sharkey
eec8bc405f
am ce960bf4: am 9f3ddd55: am e3218d35: Merge "Installing splits into ASECs!" into lmp-dev
...
* commit 'ce960bf43a17ac79aa9b26b0f80aa90163d18697':
Installing splits into ASECs!
2014-08-25 08:25:04 +00:00
George Mount
0e3de61f90
am cef72c8a: am 1bb44645: am 8c789490: Merge "API Review: change fragment transition methods." into lmp-dev
...
* commit 'cef72c8a21a9e8d0bd0f3af42114c72935701d29':
API Review: change fragment transition methods.
2014-08-25 08:24:58 +00:00