OSDN Git Service
Dianne Hackborn [Thu, 23 Jun 2016 03:19:32 +0000 (03:19 +0000)]
Merge \\"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\\" into nyc-dev am:
576e6d27bd
am:
c7ebca2a36
Change-Id: I3cc1de9010c77d1de0f36e6ad164ff107d176cbe
Dianne Hackborn [Thu, 23 Jun 2016 03:09:56 +0000 (03:09 +0000)]
Merge \"Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
am:
576e6d27bd
Change-Id: Ib4589d04fa8c157a51ccc87508969d5d93788242
Dianne Hackborn [Thu, 23 Jun 2016 03:04:25 +0000 (03:04 +0000)]
Merge "Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)" into nyc-dev
Android Build Merger (Role) [Thu, 23 Jun 2016 02:36:47 +0000 (02:36 +0000)]
Merge "Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am:
42147f0ff3 am:
83972553b4" into nyc-mr1-dev-plus-aosp
Andrii Kulian [Thu, 23 Jun 2016 02:36:22 +0000 (02:36 +0000)]
Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am:
42147f0ff3
am:
83972553b4
Change-Id: I1f44567347b7364dfd545cb75a8db43ee1a047f7
Ta-wei Yen [Thu, 23 Jun 2016 02:35:38 +0000 (02:35 +0000)]
Merge \"Add more configuration state for visual voicemail\" into nyc-mr1-dev
am:
fbb87a0591
Change-Id: I2e1e11c5ef9ec8a166d232efd4f167de6a4d55f2
Andrii Kulian [Thu, 23 Jun 2016 02:35:28 +0000 (02:35 +0000)]
Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am:
42147f0ff3
am:
d82efd36dc
Change-Id: I48fb59f6afa681e4846e13384befa12b7c7a7bf1
Ta-wei Yen [Thu, 23 Jun 2016 02:28:22 +0000 (02:28 +0000)]
Merge "Add more configuration state for visual voicemail" into nyc-mr1-dev
Andrii Kulian [Thu, 23 Jun 2016 02:27:25 +0000 (02:27 +0000)]
Merge \"Don\'t compare intent filters on singleTask adjacent launch\" into nyc-dev
am:
42147f0ff3
Change-Id: Ie767b54e2622a823d8e2fe2a864d788c3a81df74
Andrii Kulian [Thu, 23 Jun 2016 02:27:06 +0000 (02:27 +0000)]
Merge \"Don\'t compare intent filters on singleTask adjacent launch\" into nyc-dev
am:
42147f0ff3
Change-Id: I6e0cc9c5a1b6245735ac9ba2a645231619c38eec
TreeHugger Robot [Thu, 23 Jun 2016 02:17:23 +0000 (02:17 +0000)]
Merge "Don't compare intent filters on singleTask adjacent launch" into nyc-dev
Philip P. Moltmann [Thu, 23 Jun 2016 02:01:26 +0000 (02:01 +0000)]
Merge \\"Do not launch non exposed add printer activity\\" into nyc-dev am:
737be111cc
am:
ce7fc6c0a1
Change-Id: Ib9927ef0b49a467933bb0a1cd7f9ed3c7ff20748
Philip P. Moltmann [Thu, 23 Jun 2016 01:58:21 +0000 (01:58 +0000)]
Merge \\"Do not launch non exposed add printer activity\\" into nyc-dev am:
737be111cc
am:
89fe3e0169
Change-Id: I180895d413d789166609a1b5f95c3afdcb027137
Philip P. Moltmann [Thu, 23 Jun 2016 01:55:52 +0000 (01:55 +0000)]
Merge \"Do not launch non exposed add printer activity\" into nyc-dev
am:
737be111cc
Change-Id: Ief45b4a87071215700eaba8c21d0aff8ab0c8911
Philip P. Moltmann [Thu, 23 Jun 2016 01:55:13 +0000 (01:55 +0000)]
Merge \"Do not launch non exposed add printer activity\" into nyc-dev
am:
737be111cc
Change-Id: Ib4ebd8ed3605de40b974a8a1417f0a8bac31d1e6
TreeHugger Robot [Thu, 23 Jun 2016 01:51:06 +0000 (01:51 +0000)]
Merge "Do not launch non exposed add printer activity" into nyc-dev
Yohei Yukawa [Thu, 23 Jun 2016 01:29:58 +0000 (01:29 +0000)]
Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev
am:
dc42d7dd13
Change-Id: Icf3ca0403c7dee26a3083ca98ca1239887d471bc
Guang Zhu [Thu, 23 Jun 2016 01:29:53 +0000 (01:29 +0000)]
Merge \"temporarily disable FakeSettingsProviderTest\" into nyc-mr1-dev
am:
2b0b1e5a94
Change-Id: Ic3152624c192074838dd7ebee82d4d4a2bf74533
Yohei Yukawa [Thu, 23 Jun 2016 01:25:36 +0000 (01:25 +0000)]
Merge "Add InputMethodService#exposeContent()" into nyc-mr1-dev
TreeHugger Robot [Thu, 23 Jun 2016 01:21:08 +0000 (01:21 +0000)]
Merge "temporarily disable FakeSettingsProviderTest" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 23 Jun 2016 01:11:33 +0000 (01:11 +0000)]
Merge "Merge \\"Show unsopported display size dialog on relaunch\\" into nyc-dev am:
354c8cde6c am:
c13127f2be" into nyc-mr1-dev-plus-aosp
Andrii Kulian [Thu, 23 Jun 2016 01:10:58 +0000 (01:10 +0000)]
Merge \\"Show unsopported display size dialog on relaunch\\" into nyc-dev am:
354c8cde6c
am:
c13127f2be
Change-Id: Ie4b2397641342303742198ef50c4e21d97909aaf
Alan Viverette [Thu, 23 Jun 2016 01:10:57 +0000 (01:10 +0000)]
Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am:
22f887a014
am:
076b51536c
Change-Id: Id4012c19b97a03a04850c2d1b307680b324e4890
Andrii Kulian [Thu, 23 Jun 2016 01:07:00 +0000 (01:07 +0000)]
Merge \"Show unsopported display size dialog on relaunch\" into nyc-dev
am:
354c8cde6c
Change-Id: I46f232290ebc5cf924bf696f20eb134076e83b4f
Andrii Kulian [Thu, 23 Jun 2016 01:06:58 +0000 (01:06 +0000)]
Merge \"Show unsopported display size dialog on relaunch\" into nyc-dev
am:
354c8cde6c
Change-Id: Iaf2b6e209c95223ad4fe45416606b48e08418ca3
Android Build Merger (Role) [Thu, 23 Jun 2016 01:06:43 +0000 (01:06 +0000)]
Merge "Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am:
22f887a014 am:
54e12ac7f5" into nyc-mr1-dev-plus-aosp
Alan Viverette [Thu, 23 Jun 2016 01:06:15 +0000 (01:06 +0000)]
Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am:
22f887a014
am:
483a8dc097
Change-Id: I906d49ae22e3368792928910310f5ddc341edf8f
Alan Viverette [Thu, 23 Jun 2016 01:06:15 +0000 (01:06 +0000)]
Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am:
22f887a014
am:
54e12ac7f5
Change-Id: I64c2b1f76a5085945829a618a71e8e3c9e9253a1
Andrii Kulian [Thu, 23 Jun 2016 01:00:35 +0000 (01:00 +0000)]
Merge "Show unsopported display size dialog on relaunch" into nyc-dev
Alan Viverette [Thu, 23 Jun 2016 01:00:32 +0000 (01:00 +0000)]
Merge \"Clarify docs for PopupWindow width/height parameters\" into nyc-dev
am:
22f887a014
Change-Id: I7311e8cb98da040148e961734646251949975270
Alan Viverette [Thu, 23 Jun 2016 01:00:18 +0000 (01:00 +0000)]
Merge \"Clarify docs for PopupWindow width/height parameters\" into nyc-dev
am:
22f887a014
Change-Id: I84d345cde0d16e98ce3fefa703929f243a5fdced
Alan Viverette [Thu, 23 Jun 2016 00:55:51 +0000 (00:55 +0000)]
Merge "Clarify docs for PopupWindow width/height parameters" into nyc-dev
Baligh Uddin [Thu, 23 Jun 2016 00:52:11 +0000 (00:52 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
b9aa9b47e7 -s ours
am:
a0b34b32c3 -s ours
Change-Id: I85c704338b0a68a5743ba346ee361e0a3310b821
Baligh Uddin [Thu, 23 Jun 2016 00:48:53 +0000 (00:48 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
b9aa9b47e7 -s ours
am:
c446ef54ae -s ours
Change-Id: If7a2109f29f5b76bf1e40b4f92019a0dcd3613c6
Ta-wei Yen [Thu, 23 Jun 2016 00:48:52 +0000 (17:48 -0700)]
Add more configuration state for visual voicemail
Bug:
26944391
Change-Id: I7e0c2649097edca96d6a78fe2dc250a4b4855133
Baligh Uddin [Thu, 23 Jun 2016 00:43:44 +0000 (00:43 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
b9aa9b47e7 -s ours
Change-Id: I5c878620d97c3c6e90b3579e1102f56e14a8c6eb
Baligh Uddin [Thu, 23 Jun 2016 00:43:40 +0000 (00:43 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
b9aa9b47e7 -s ours
Change-Id: I6800e94bd8ca728af636dc0b46768bee708c6236
Baligh Uddin [Thu, 23 Jun 2016 00:40:01 +0000 (00:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Shibin George [Thu, 23 Jun 2016 00:27:13 +0000 (00:27 +0000)]
Merge \\\"Fix deadlock b/w ActivityManagerService and MediaSessionService\\\" am:
4eea3a7f88 am:
42927c4e94
am:
b91869d35f
Change-Id: Ib0fb475a6b29b7c7d198197aa9dc363551b87505
Shibin George [Thu, 23 Jun 2016 00:24:23 +0000 (00:24 +0000)]
Merge \\"Fix deadlock b/w ActivityManagerService and MediaSessionService\\" am:
4eea3a7f88
am:
42927c4e94
Change-Id: Ieb503007f420f06c599b8fc9f4703954885754b0
Jim Miller [Thu, 23 Jun 2016 00:20:57 +0000 (00:20 +0000)]
Merge \"Enable fingerprint sensor navigation to invoke QuickSettings - rename \"FP_NAV\" to more generic \"SYSTEM_NAVIGATION\"\" into nyc-mr1-dev
am:
0520091641
Change-Id: I285f751bd449c89685a88ad30073cd011dfe5061
Shibin George [Thu, 23 Jun 2016 00:20:35 +0000 (00:20 +0000)]
Merge \"Fix deadlock b/w ActivityManagerService and MediaSessionService\"
am:
4eea3a7f88
Change-Id: I499c69fd3890ada652213c0510df3b884223a5df
Andrii Kulian [Thu, 23 Jun 2016 00:16:45 +0000 (17:16 -0700)]
Don't compare intent filters on singleTask adjacent launch
Bug:
29578845
Change-Id: Ic1614fc1f321e80ffdc2ab498d720657f393c239
Treehugger Robot [Thu, 23 Jun 2016 00:13:44 +0000 (00:13 +0000)]
Merge "Fix deadlock b/w ActivityManagerService and MediaSessionService"
Jim Miller [Thu, 23 Jun 2016 00:13:38 +0000 (00:13 +0000)]
Merge "Enable fingerprint sensor navigation to invoke QuickSettings - rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"" into nyc-mr1-dev
Dianne Hackborn [Wed, 22 Jun 2016 23:49:14 +0000 (16:49 -0700)]
Fix issue #
29532165: System Server Java Crashes in WiFi (RT Restart)
I really have no idea how this can be happening (we check
for a null intent before posting the args), but add another
check before dispatching to try to avoid it.
Change-Id: Ic704850c9750b6a078c49ea628189be568031086
Android Build Merger (Role) [Wed, 22 Jun 2016 23:51:22 +0000 (23:51 +0000)]
Merge "Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am:
16038a0c5f am:
0a3a75e121" into nyc-mr1-dev-plus-aosp
John Reck [Wed, 22 Jun 2016 23:50:54 +0000 (23:50 +0000)]
Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am:
16038a0c5f
am:
0a3a75e121
Change-Id: I579930de1951b2112ce51016007a0358067f9934
John Reck [Wed, 22 Jun 2016 23:50:38 +0000 (23:50 +0000)]
Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am:
16038a0c5f
am:
fdff97caf0
Change-Id: I1a2158abc35bd9da5e1e7b5cfc93867a938a5b70
John Reck [Wed, 22 Jun 2016 23:45:50 +0000 (23:45 +0000)]
Merge \"Change approach for windowPositionLostRT\" into nyc-dev
am:
16038a0c5f
Change-Id: I80f6bf6d169c43a10106857627f5c127d94d00a4
John Reck [Wed, 22 Jun 2016 23:45:34 +0000 (23:45 +0000)]
Merge \"Change approach for windowPositionLostRT\" into nyc-dev
am:
16038a0c5f
Change-Id: Ia6d1b8cfa2c5d126b702eb84895093fa3f893b00
Philip P. Moltmann [Wed, 22 Jun 2016 23:12:27 +0000 (16:12 -0700)]
Do not launch non exposed add printer activity
Change-Id: I0b9b11ea0ce0140c77dff2539b1a0a9dcf1558b0
Fixes:
29580579
John Reck [Wed, 22 Jun 2016 23:38:23 +0000 (23:38 +0000)]
Merge "Change approach for windowPositionLostRT" into nyc-dev
Baligh Uddin [Wed, 22 Jun 2016 23:33:07 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29322470
Change-Id: Iec697120d3e8b234bde18e0e37f02ad532796816
Yohei Yukawa [Wed, 22 Jun 2016 23:31:41 +0000 (16:31 -0700)]
Add InputMethodService#exposeContent()
This is a follow up CL to my previous CLs [1][2] that introduced
InputConnection#commitContent(InputContentInfo, Bundle) API to enable
IMEs to send a content to the target application.
With this CL, IME developers are able to temporarily expose
InputContentInfo object to the target package without permanently
granting URI permission. Although calling IMS#exposeContent() is
allowed only for the IME that is currently selected, the client is able
to request a temporary read-only access even after the current IME is
switched to any other IME as long as the client keeps InputContentInfo
object.
Here is a sample code snippet about how to use this mechanism.
[IME]
InputContentInfo contentInfo = new InputContentInfo(
contentUri,
new ClipDescription(description, new String[]{mimeType}),
linkUrl);
exposeContent(contentInfo, getCurrentInputEditorInfo());
getCurrentInputConnection().commitContent(inputContentInfo, null);
[App]
try {
contentInfo.requestPermission();
// Load inputContentInfo.getContentUri() here.
} finally {
contentInfo.releasePermission();
}
[1]: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
152944f4909c47917473293b258d266435c6ab35
[2]: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
adebb52588b098a1af678d4e33a234ef1ce783b2
Bug:
29450031
Change-Id: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
Guang Zhu [Wed, 22 Jun 2016 23:30:09 +0000 (16:30 -0700)]
temporarily disable FakeSettingsProviderTest
Bug:
29281167
Change-Id: I463d7707c197bd114de762c86e3b3e574d456e3b
Android Build Merger (Role) [Wed, 22 Jun 2016 23:10:06 +0000 (23:10 +0000)]
Merge "Merge \\"Fix adb backup/restore\\" into nyc-dev am:
45c79447ad am:
c5202cac7f" into nyc-mr1-dev-plus-aosp
John Reck [Wed, 22 Jun 2016 21:23:31 +0000 (14:23 -0700)]
Change approach for windowPositionLostRT
Bug:
29547000
Instead of shifting the window off screen fall
back to the UI-thread calculated values. This fixes
a race issue around tear-down where we stop
drawing long before our window is actually no longer
visible, as well as fixes a funky issue with
PRESERVE_GEOMETRY during first draw.
Change-Id: I792d1966f5aaee1e703295ae79166c723b97a1dc
Christopher Tate [Wed, 22 Jun 2016 23:09:42 +0000 (23:09 +0000)]
Merge \\"Fix adb backup/restore\\" into nyc-dev am:
45c79447ad
am:
c5202cac7f
Change-Id: I910b4740a535536f53b7d7971f497967089872a1
Christopher Tate [Wed, 22 Jun 2016 23:09:11 +0000 (23:09 +0000)]
Merge \\"Fix adb backup/restore\\" into nyc-dev am:
45c79447ad
am:
77d15483ad
Change-Id: Ica4b633fd67d3d2bd8b939138c61a64b2022503f
Christopher Tate [Wed, 22 Jun 2016 23:05:05 +0000 (23:05 +0000)]
Merge \"Fix adb backup/restore\" into nyc-dev
am:
45c79447ad
Change-Id: Ieab601b2676f18f068280a9f5dfd8501fd5978f0
Christopher Tate [Wed, 22 Jun 2016 23:04:44 +0000 (23:04 +0000)]
Merge \"Fix adb backup/restore\" into nyc-dev
am:
45c79447ad
Change-Id: Ie3bce4a97ec1ecb4ba742ef65555b7db510f10d0
Android Build Merger (Role) [Wed, 22 Jun 2016 23:01:32 +0000 (23:01 +0000)]
Merge "Merge \\"Report all content changes to a11y services.\\" into nyc-dev am:
8ac5bcbab2 am:
2abe1c44e0" into nyc-mr1-dev-plus-aosp
Phil Weaver [Wed, 22 Jun 2016 23:00:51 +0000 (23:00 +0000)]
Merge \\"Report all content changes to a11y services.\\" into nyc-dev am:
8ac5bcbab2
am:
2abe1c44e0
Change-Id: Ic761e3a1a23a6e6842881bc43a123bcb03189d36
Phil Weaver [Wed, 22 Jun 2016 23:00:48 +0000 (23:00 +0000)]
Merge \\"Report all content changes to a11y services.\\" into nyc-dev am:
8ac5bcbab2
am:
403ee9c3e0
Change-Id: I57789628dea63b871a378121dbe67f0bc3af9fb9
TreeHugger Robot [Wed, 22 Jun 2016 22:56:34 +0000 (22:56 +0000)]
Merge "Fix adb backup/restore" into nyc-dev
Phil Weaver [Wed, 22 Jun 2016 22:54:08 +0000 (22:54 +0000)]
Merge \"Report all content changes to a11y services.\" into nyc-dev
am:
8ac5bcbab2
Change-Id: I45c63d9887eee21f571984c2e7b2aa31bd80c790
Phil Weaver [Wed, 22 Jun 2016 22:53:17 +0000 (22:53 +0000)]
Merge \"Report all content changes to a11y services.\" into nyc-dev
am:
8ac5bcbab2
Change-Id: I9338fd3ef749f80c4b0252c7c749fe6e395b3c0a
Fyodor Kupolov [Wed, 22 Jun 2016 22:51:28 +0000 (22:51 +0000)]
Merge \\"Use granted userId to look up provider info\\" into nyc-dev am:
f9f2c7ceef
am:
eb3f3aa46d
Change-Id: I4a58dc629d8562f33dcc0f43ef2b9aace8e91fa5
Adam Lesinski [Wed, 22 Jun 2016 22:51:22 +0000 (22:51 +0000)]
Merge \\"Fix build due to missing abstract method impl\\" into nyc-dev am:
aeef7c4748
am:
a34b917ce0
Change-Id: I53fe91a7fcb745accf0e660b675b53f76aa55734
Phil Weaver [Wed, 22 Jun 2016 22:48:49 +0000 (22:48 +0000)]
Merge "Report all content changes to a11y services." into nyc-dev
Fyodor Kupolov [Wed, 22 Jun 2016 22:47:46 +0000 (22:47 +0000)]
Merge \\"Use granted userId to look up provider info\\" into nyc-dev am:
f9f2c7ceef
am:
7bc1db96ed
Change-Id: I914c389f3b326eefdada42e2d55c116d308521c4
Adam Lesinski [Wed, 22 Jun 2016 22:47:39 +0000 (22:47 +0000)]
Merge \\"Fix build due to missing abstract method impl\\" into nyc-dev am:
aeef7c4748
am:
e0dc709ac8
Change-Id: I2360c6d049352c4e32f33096d3f659d636941417
Fyodor Kupolov [Wed, 22 Jun 2016 22:41:57 +0000 (22:41 +0000)]
Merge \"Use granted userId to look up provider info\" into nyc-dev
am:
f9f2c7ceef
Change-Id: I7af8b1867bb4a1784658f445c91158c0e4c43667
Adam Lesinski [Wed, 22 Jun 2016 22:41:52 +0000 (22:41 +0000)]
Merge \"Fix build due to missing abstract method impl\" into nyc-dev
am:
aeef7c4748
Change-Id: I9d12601b4db0108f313c1a69ada67c92929f548b
Fyodor Kupolov [Wed, 22 Jun 2016 22:41:42 +0000 (22:41 +0000)]
Merge \"Use granted userId to look up provider info\" into nyc-dev
am:
f9f2c7ceef
Change-Id: Ifb6876fbb424632d3b47ec68686c01b56720b0a4
Adam Lesinski [Wed, 22 Jun 2016 22:41:38 +0000 (22:41 +0000)]
Merge \"Fix build due to missing abstract method impl\" into nyc-dev
am:
aeef7c4748
Change-Id: I38fc7c88e9c4ea5abf50a0bec5f2302c4622605f
Fyodor Kupolov [Wed, 22 Jun 2016 22:28:37 +0000 (22:28 +0000)]
Merge "Use granted userId to look up provider info" into nyc-dev
Adam Lesinski [Wed, 22 Jun 2016 22:20:54 +0000 (22:20 +0000)]
Merge "Fix build due to missing abstract method impl" into nyc-dev
Jim Miller [Wed, 22 Jun 2016 22:18:13 +0000 (15:18 -0700)]
Enable fingerprint sensor navigation to invoke QuickSettings
- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"
Fixes bug
28869612
Change-Id: I321240ee54506633d63a29e987b8d8638c652391
Andrii Kulian [Wed, 22 Jun 2016 21:49:58 +0000 (14:49 -0700)]
Show unsopported display size dialog on relaunch
If the display density change made app restart when it was focused
or we navigate back to it after density change and it makes it
restart - we didn't display unsupported display size dialog.
Bug:
29574686
Change-Id: Ic8fdc8a54df160f947e2d340ab2cb2931bac195d
Roozbeh Pournader [Wed, 22 Jun 2016 21:26:29 +0000 (21:26 +0000)]
Merge \"Don\'t match locales with different scripts in ResourceFilter\" into nyc-mr1-dev
am:
9d2a3188fa
Change-Id: I9874c4a5d880407ed7b38e63f2c551defedbf8e5
Roozbeh Pournader [Wed, 22 Jun 2016 21:20:42 +0000 (21:20 +0000)]
Merge "Don't match locales with different scripts in ResourceFilter" into nyc-mr1-dev
Robert Greenwalt [Wed, 22 Jun 2016 21:19:01 +0000 (21:19 +0000)]
Merge \"Add a Carrier-config specific ratcheter of RATs.\" into nyc-mr1-dev
am:
23cac795b0
Change-Id: Ifa8987968a04e4df3eb3b85610c23a1b241de247
Robert Greenwalt [Wed, 22 Jun 2016 21:12:14 +0000 (21:12 +0000)]
Merge "Add a Carrier-config specific ratcheter of RATs." into nyc-mr1-dev
Christopher Tate [Fri, 17 Jun 2016 20:24:02 +0000 (13:24 -0700)]
Fix adb backup/restore
* Exclude key/value-only backup participants until we have a chance to
augment the archive format with proper handling.
* Don't back up 'stopped' apps, which would un-stop them
* Fix unspecified-user bindService/startActivity invocations
* Teach adb restore about the onRestoreFinished() lifecycle method
* Implement proper app timeout handling in the adb data flows
* Backstop wallpaper backup against rare leftover-state issues
Bug
28056941
Change-Id: Ia59c71a2c74a632a2c2a527b9b7374229c440d46
Android Build Merger (Role) [Wed, 22 Jun 2016 20:52:03 +0000 (20:52 +0000)]
Merge "Merge \\"Fixed whitelistManager assignment.\\" into nyc-dev am:
dea7aa0da1 am:
1f358b11ae" into nyc-mr1-dev-plus-aosp
Felipe Leme [Wed, 22 Jun 2016 20:51:26 +0000 (20:51 +0000)]
Merge \\"Fixed whitelistManager assignment.\\" into nyc-dev am:
dea7aa0da1
am:
3aa1952e5c
Change-Id: I0cacc3e9824e580cd8902b15bc28439f79993bd8
Felipe Leme [Wed, 22 Jun 2016 20:51:21 +0000 (20:51 +0000)]
Merge \\"Fixed whitelistManager assignment.\\" into nyc-dev am:
dea7aa0da1
am:
1f358b11ae
Change-Id: Idaf93ee269522d0a37b424d5360a7505484cdbf7
Felipe Leme [Wed, 22 Jun 2016 20:46:01 +0000 (20:46 +0000)]
Merge \"Fixed whitelistManager assignment.\" into nyc-dev
am:
dea7aa0da1
Change-Id: I5b535a8dbbbf4f567435d666d07d909a9e79021e
Felipe Leme [Wed, 22 Jun 2016 20:45:54 +0000 (20:45 +0000)]
Merge \"Fixed whitelistManager assignment.\" into nyc-dev
am:
dea7aa0da1
Change-Id: I3ba91e222cf0a04e2a08bbefc7d0aeea20485bcb
TreeHugger Robot [Wed, 22 Jun 2016 20:40:19 +0000 (20:40 +0000)]
Merge "Fixed whitelistManager assignment." into nyc-dev
Android Build Merger (Role) [Wed, 22 Jun 2016 20:20:36 +0000 (20:20 +0000)]
Merge "Merge \\"Avoid runtime restart when storage is missing.\\" into nyc-dev am:
18553f5f73 am:
5d1d637086" into nyc-mr1-dev-plus-aosp
Jeff Sharkey [Wed, 22 Jun 2016 20:20:09 +0000 (20:20 +0000)]
Merge \\"Avoid runtime restart when storage is missing.\\" into nyc-dev am:
18553f5f73
am:
5d1d637086
Change-Id: I0544e3b50df9c7cc821f2612183b15e2e87d4044
Jeff Sharkey [Wed, 22 Jun 2016 20:20:05 +0000 (20:20 +0000)]
Merge \\"Avoid runtime restart when storage is missing.\\" into nyc-dev am:
18553f5f73
am:
c14abae170
Change-Id: I0784fd084dc7767f511b60ee95b702ebd8e063a0
Jeff Sharkey [Wed, 22 Jun 2016 20:14:54 +0000 (20:14 +0000)]
Merge \"Avoid runtime restart when storage is missing.\" into nyc-dev
am:
18553f5f73
Change-Id: I0f8e9b715eb0ddddbf36dcbcdf78e75e692303dc
Jeff Sharkey [Wed, 22 Jun 2016 20:14:45 +0000 (20:14 +0000)]
Merge \"Avoid runtime restart when storage is missing.\" into nyc-dev
am:
18553f5f73
Change-Id: I9303aa177f25f27db7090bf2464218d690aaeafe
Adam Lesinski [Wed, 22 Jun 2016 20:11:40 +0000 (13:11 -0700)]
Fix build due to missing abstract method impl
getDisplay() was added to Context, which needs to be implemented
for BridgeContext.
Bug:
28388969
Change-Id: I7b0ffcbbe252403e35f08d3fa40d6b0e4dbf0daa
TreeHugger Robot [Wed, 22 Jun 2016 20:08:17 +0000 (20:08 +0000)]
Merge "Avoid runtime restart when storage is missing." into nyc-dev
Lifu Tang [Wed, 22 Jun 2016 20:02:14 +0000 (20:02 +0000)]
Merge \\"Added more logs to track WakeLock usages\\" into nyc-dev am:
335387a1df
am:
a956144f0d
Change-Id: Ida29ff96b8a9c395304c3976c68915e4309d88d2
OSDN Git Service
