Lifu Tang
b3e11be230
Created new task when launching injected activity
...
Bug: 22320782
Change-Id: I6cf1e4976a097c4c40afcc4c73f7f9904e9e7aac
2015-08-25 18:45:52 -07:00
Geoff Mendal
0375494a42
am c34f7fc7: (-s ours) am 40a54fd8: (-s ours) am c064ecdf: (-s ours) am 3ca58bbd: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c34f7fc7724ef71df4f3eb2d2888c534ae09f06f':
Import translations. DO NOT MERGE
2015-08-08 14:59:39 +00:00
Geoff Mendal
c34f7fc772
am 40a54fd8: (-s ours) am c064ecdf: (-s ours) am 3ca58bbd: (-s ours) Import translations. DO NOT MERGE
...
* commit '40a54fd8081ee2908aefeffafb71b84ea2b067e8':
Import translations. DO NOT MERGE
2015-08-08 14:53:06 +00:00
Geoff Mendal
40a54fd808
am c064ecdf: (-s ours) am 3ca58bbd: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c064ecdf79ec1c4651f77e1ffcd1c3143f7b47ed':
Import translations. DO NOT MERGE
2015-08-08 14:45:45 +00:00
Geoff Mendal
c064ecdf79
am 3ca58bbd: (-s ours) Import translations. DO NOT MERGE
...
* commit '3ca58bbda3d1daacc6750a1502a775641b2d0961':
Import translations. DO NOT MERGE
2015-08-08 14:36:30 +00:00
Geoff Mendal
3ca58bbda3
Import translations. DO NOT MERGE
...
Change-Id: I49911941b08daff0dce1d0ec3ca9b21ae209650b
Auto-generated-cl: translation import
2015-08-08 07:26:58 -07:00
Geoff Mendal
7d4610e905
Import translations. DO NOT MERGE
...
Change-Id: I501f43a2a13a2acbbc36e9533abaef1eea7e3758
Auto-generated-cl: translation import
2015-08-08 06:37:16 -07:00
Jeff Sharkey
fbbefae25c
am 737213fc: am 0f4465a4: am 11088b81: am cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
...
* commit '737213fc8750e8db065a6575b4a15e1b4b19d78b':
Block moving when already in progress.
2015-08-08 02:50:30 +00:00
Billy Lau
4efd2640a4
am c2012bb4: am 16dc289d: am 8c26cbd8: am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit 'c2012bb4792299d16ea1c55c40ad18cdfad9a134':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-08 02:49:48 +00:00
Dianne Hackborn
eb8d922c37
am 81a3ef13: am a3e66576: am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '81a3ef139b3f607562b784430fe2748f3eff9713':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-08 02:49:34 +00:00
Jeff Sharkey
737213fc87
am 0f4465a4: am 11088b81: am cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
...
* commit '0f4465a4cd84ba8acac52cafc13104b6dc054877':
Block moving when already in progress.
2015-08-08 00:13:16 +00:00
Jeff Sharkey
0f4465a4cd
am 11088b81: am cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
...
* commit '11088b815b030114b14f8a3e7d81d9238c2d51b8':
Block moving when already in progress.
2015-08-08 00:06:40 +00:00
Jeff Sharkey
11088b815b
am cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
...
* commit 'cb0c07181a77ef134310c0e037345f33e7a46d9e':
Block moving when already in progress.
2015-08-07 23:58:46 +00:00
Jeff Sharkey
cb0c07181a
am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
...
* commit '67f0739ca3a81515975856b09d216debfd090ae9':
Block moving when already in progress.
2015-08-07 23:51:57 +00:00
Jeff Sharkey
67f0739ca3
Merge "Block moving when already in progress." into mnc-dev
2015-08-07 23:38:44 +00:00
Jeff Sharkey
16634fd0ff
Block moving when already in progress.
...
Use frozen state as a proxy for knowing if a package is currently
being moved, and block any new move requests until the current move
is finished.
Bug: 22069486
Change-Id: I50a70353132c1035b969982f0b7779f5dcb2251d
2015-08-07 15:59:28 -07:00
Billy Lau
c2012bb479
am 16dc289d: am 8c26cbd8: am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '16dc289d5b29ecccf02fc86349ab53cbc10e6b11':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:42:55 +00:00
Billy Lau
16dc289d5b
am 8c26cbd8: am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '8c26cbd87e8fe5880f84c5a27c89176e045f6669':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:36:29 +00:00
Billy Lau
8c26cbd87e
am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit '5b2c66e4da749ca59d09776ec7831e20d1211909':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:28:38 +00:00
Dianne Hackborn
81a3ef139b
am a3e66576: am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'a3e665765882c7919d8d41dc5caa42d1e17b6044':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-07 22:25:36 +00:00
Billy Lau
5b2c66e4da
am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit 'a59f39fca65d0828b0e4ade95a8404282e858ba9':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:22:19 +00:00
Dianne Hackborn
a3e6657658
am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '1ded441390e79dc46d576dadbbf1a69da12d399d':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-07 22:20:50 +00:00
Billy Lau
a59f39fca6
Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
2015-08-07 22:15:32 +00:00
Dianne Hackborn
1ded441390
am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '7a3a453349fb51043d84adc21f87472ba34c49a8':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-07 22:12:58 +00:00
Dianne Hackborn
7a3a453349
am e7a5966a: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-07 22:05:56 +00:00
Dianne Hackborn
e7a5966aa7
Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
2015-08-07 21:58:52 +00:00
Dianne Hackborn
f5497aa93c
Fix issue #23037720 : New Battery Optimization Strings
...
Thar be strings.
Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
2015-08-07 14:43:55 -07:00
Julia Reynolds
13b1ef1482
am af3414c2: am 559a3e78: am e113f0c4: am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
...
* commit 'af3414c2c759f07d3febb89cd161bac4f91ce21a':
Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 17:04:24 +00:00
Julia Reynolds
af3414c2c7
am 559a3e78: am e113f0c4: am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
...
* commit '559a3e788652d448c2c95e2c024cf9f444258ca7':
Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:57:50 +00:00
Julia Reynolds
559a3e7886
am e113f0c4: am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
...
* commit 'e113f0c4876b7529170768f8c7cf99f218d48ca8':
Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:52:11 +00:00
Julia Reynolds
e113f0c487
am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
...
* commit 'b7028f254de1f7fdda5c3ee248f2e5a9294cc4dd':
Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:45:04 +00:00
Julia Reynolds
b7028f254d
am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
...
* commit '5ab0e183abdd4008c5591011804d0bc770851a7f':
Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:34:58 +00:00
Julia Reynolds
5ab0e183ab
Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
2015-08-07 16:29:41 +00:00
Geoff Mendal
ccd54267ae
am fab5c39a: (-s ours) am 75a77cc7: (-s ours) am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fab5c39af678c5fb0142e6d5a0f23a046df96535':
Import translations. DO NOT MERGE
2015-08-07 06:07:14 +00:00
Geoff Mendal
fab5c39af6
am 75a77cc7: (-s ours) am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
...
* commit '75a77cc77d30be0b8eb7b0e8dbd398ba1d8321cb':
Import translations. DO NOT MERGE
2015-08-07 05:02:05 +00:00
Geoff Mendal
75a77cc77d
am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
...
* commit '233f1b61ce627819adb4351eb0b2d78f3020a38d':
Import translations. DO NOT MERGE
2015-08-07 04:55:25 +00:00
Geoff Mendal
233f1b61ce
am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
...
* commit '6540a97291a5217558e67e5ed4186a25fbd16145':
Import translations. DO NOT MERGE
2015-08-07 04:48:08 +00:00
Geoff Mendal
6540a97291
am 2d546b77: (-s ours) Import translations. DO NOT MERGE
...
* commit '2d546b77b997376416e2ba22d5a01ef6da27cbb3':
Import translations. DO NOT MERGE
2015-08-07 04:44:05 +00:00
Geoff Mendal
2d546b77b9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
2015-08-07 04:21:22 +00:00
Andres Morales
2eec566259
am 23f40d37: am ae560bf1: am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
...
* commit '23f40d37fcfc3e7718ef40065a51360f5b4b2239':
fix CC for work profiles
2015-08-06 22:54:46 +00:00
Andres Morales
23f40d37fc
am ae560bf1: am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
...
* commit 'ae560bf189a7f738d67e87ed78579203b99a0066':
fix CC for work profiles
2015-08-06 22:49:32 +00:00
Andres Morales
ae560bf189
am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
...
* commit '13d387631f586d03a77aace9da9a991d5aea32ba':
fix CC for work profiles
2015-08-06 22:41:42 +00:00
Andres Morales
13d387631f
am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
...
* commit 'd4c3dff6e3f900ab5693c9406ea625c2e398f7ba':
fix CC for work profiles
2015-08-06 22:36:04 +00:00
Andres Morales
d4c3dff6e3
am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
...
* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
fix CC for work profiles
2015-08-06 22:30:55 +00:00
Andres Morales
4897fa87a5
Merge "fix CC for work profiles" into mnc-dev
2015-08-06 22:22:17 +00:00
Julia Reynolds
2f01c5f5b5
Hide optimization control on battery details page for non whitelisted apps.
...
Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
2015-08-06 11:42:40 -04:00
Geoff Mendal
e3d731c138
am 8c35777f: (-s ours) am 79aed477: (-s ours) am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
...
* commit '8c35777f45f925bc3b2600807a15d74fa43c20f6':
Import translations. DO NOT MERGE
2015-08-06 04:42:23 +00:00
Geoff Mendal
8c35777f45
am 79aed477: (-s ours) am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
...
* commit '79aed4774745113f5b110fcfd82a3ee64ff6ecc1':
Import translations. DO NOT MERGE
2015-08-06 04:38:14 +00:00
Geoff Mendal
919bcf72e7
am a7a0e552: (-s ours) am 870ba029: (-s ours) am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a7a0e5526b20caa3107dd2ff69ed00ddcaa52d5e':
Import translations. DO NOT MERGE
2015-08-06 04:33:27 +00:00
Geoff Mendal
79aed47747
am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
...
* commit '05facd935a44d882ca6f5e0ee7b3b1cffd1c0ad4':
Import translations. DO NOT MERGE
2015-08-06 04:32:56 +00:00
