OSDN Git Service
Alan Viverette [Mon, 6 Apr 2015 22:01:23 +0000 (15:01 -0700)]
Fix progress tint attributes
Change-Id: Ie22f5177144ecbe981f6b342236714a3ce520cbc
Yin-Chia Yeh [Mon, 6 Apr 2015 17:42:45 +0000 (17:42 +0000)]
Merge "Camera: add equals/hashCode to OutputConfiguration"
Fyodor Kupolov [Mon, 6 Apr 2015 17:27:43 +0000 (17:27 +0000)]
Merge "Restored original behavior of getApplicationRestrictions"
Wale Ogunwale [Mon, 6 Apr 2015 17:27:17 +0000 (17:27 +0000)]
Merge "Dismiss recents to home without animation when resizing task."
Fyodor Kupolov [Mon, 6 Apr 2015 17:15:07 +0000 (10:15 -0700)]
Restored original behavior of getApplicationRestrictions
JavaDoc for getApplicationRestrictions states that null is a valid return
value, but it turns out some apps do not expect that. This fix restores
the original behavior of returning an empty bundle.
Bug:
20081431
Change-Id: I30a4aa6aba14307eba59ba0015f80f14107269af
Olawale Ogunwale [Mon, 6 Apr 2015 16:19:52 +0000 (16:19 +0000)]
am
00e1d5cf: am
1d065987: am
47c1cf4b: Merge "[ActivityManager] Fix ServiceRecord leakage"
* commit '
00e1d5cf5e717be8794381c2895893b41126f266':
[ActivityManager] Fix ServiceRecord leakage
Wale Ogunwale [Mon, 6 Apr 2015 16:16:26 +0000 (09:16 -0700)]
resolved conflicts for merge of
60df172f to master
Change-Id: I15f90e041399d2133c041b0449e6d6a95d36595a
Olawale Ogunwale [Mon, 6 Apr 2015 16:04:30 +0000 (16:04 +0000)]
am
8e2ab719: am
694a8ef9: am
baedbfbb: Merge "[ProcessStas] fix index out of bounds when add duration."
* commit '
8e2ab71935251cf47234cce47f4fa38590548cf9':
[ProcessStas] fix index out of bounds when add duration.
Mike Lockwood [Mon, 6 Apr 2015 15:53:35 +0000 (15:53 +0000)]
Merge "Add MidiManager and MidiDevice classes to public API."
Olawale Ogunwale [Mon, 6 Apr 2015 15:53:27 +0000 (15:53 +0000)]
am
1d065987: am
47c1cf4b: Merge "[ActivityManager] Fix ServiceRecord leakage"
* commit '
1d065987ebe5a3ac9480f7871b6fb69fca98ef85':
[ActivityManager] Fix ServiceRecord leakage
Olawale Ogunwale [Mon, 6 Apr 2015 15:53:21 +0000 (15:53 +0000)]
am
adedb407: am
655ef081: Merge "[ActivityManager] Examine bad process before clean up application record"
* commit '
adedb407c5cedaba123ea5f44f3d68fd98e8ee55':
[ActivityManager] Examine bad process before clean up application record
Olawale Ogunwale [Mon, 6 Apr 2015 15:53:15 +0000 (15:53 +0000)]
am
694a8ef9: am
baedbfbb: Merge "[ProcessStas] fix index out of bounds when add duration."
* commit '
694a8ef93826f517cbaf33eeeb96f34ec1c2533d':
[ProcessStas] fix index out of bounds when add duration.
Olawale Ogunwale [Mon, 6 Apr 2015 15:44:31 +0000 (15:44 +0000)]
am
47c1cf4b: Merge "[ActivityManager] Fix ServiceRecord leakage"
* commit '
47c1cf4b35616059409a0674382c2318494e877b':
[ActivityManager] Fix ServiceRecord leakage
Olawale Ogunwale [Mon, 6 Apr 2015 15:44:24 +0000 (15:44 +0000)]
am
655ef081: Merge "[ActivityManager] Examine bad process before clean up application record"
* commit '
655ef08144ec0b71a98b6b3a38e50c6b346ae467':
[ActivityManager] Examine bad process before clean up application record
Olawale Ogunwale [Mon, 6 Apr 2015 15:44:08 +0000 (15:44 +0000)]
am
baedbfbb: Merge "[ProcessStas] fix index out of bounds when add duration."
* commit '
baedbfbbb1181829bcffb1be3732b6f26a315bd8':
[ProcessStas] fix index out of bounds when add duration.
Olawale Ogunwale [Mon, 6 Apr 2015 15:25:03 +0000 (15:25 +0000)]
Merge "[ActivityManager] Fix ServiceRecord leakage"
Olawale Ogunwale [Mon, 6 Apr 2015 15:24:40 +0000 (15:24 +0000)]
Merge "[ActivityManager] Examine bad process before clean up application record"
Olawale Ogunwale [Mon, 6 Apr 2015 15:23:29 +0000 (15:23 +0000)]
Merge "[ProcessStas] fix index out of bounds when add duration."
George Mount [Mon, 6 Apr 2015 14:22:45 +0000 (14:22 +0000)]
Merge "Reset transitionAlpha when the transition is stopped early."
Geoff Mendal [Mon, 6 Apr 2015 14:19:29 +0000 (14:19 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 6 Apr 2015 14:16:49 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4bab338f56220ad2a335707c2814ddfc3ecaebf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Apr 2015 12:58:56 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 6 Apr 2015 12:52:58 +0000 (05:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5408db40baf8a37319fecde3156bc01ec1feee70
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Apr 2015 12:35:32 +0000 (12:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 6 Apr 2015 12:32:59 +0000 (05:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f89528f6ae805899dc48a039f3c08ceeabd8480
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Apr 2015 12:17:12 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I34445592f741f1566ae5493a8f591391ca65d435
Auto-generated-cl: translation import
Jinsuk Kim [Mon, 6 Apr 2015 01:23:12 +0000 (01:23 +0000)]
Merge "CEC: Let arc termination start before standby"
Jinsuk Kim [Mon, 6 Apr 2015 01:22:24 +0000 (01:22 +0000)]
Merge "CEC: Support arc feature flag for multiple ports"
Jinsuk Kim [Mon, 6 Apr 2015 01:19:43 +0000 (01:19 +0000)]
Merge "CEC: Back up active input correctly against repeated active source commands"
Jeff Sharkey [Sun, 5 Apr 2015 04:38:35 +0000 (04:38 +0000)]
Merge "Fix up ExternalStorageFormatter."
Jeff Sharkey [Sun, 5 Apr 2015 04:37:20 +0000 (21:37 -0700)]
Fix up ExternalStorageFormatter.
It's not going to be around for much longer, so just fix enough to
work correctly.
Also teach about new "unmountable" state from vold.
Bug:
19993667
Change-Id: Ib72c3e134092b2a895389dd5b056f4bb8043709a
Jeff Sharkey [Sun, 5 Apr 2015 03:04:25 +0000 (03:04 +0000)]
Merge "Storage methods using IDs, update listeners."
Jeff Sharkey [Sat, 4 Apr 2015 22:22:37 +0000 (15:22 -0700)]
Storage methods using IDs, update listeners.
Add StorageManager methods that work with Disk and Volume IDs instead
of paths which can change over time. For example, a freshly formatted
volume has a different UUID and mount point, even though it's the same
volume.
Update StorageEventListener to be all one-way calls to avoid blocking
while dispatching events. Add new listener method for Volume-level
state changes. The existing state method will remain focused on the
per-user state reflected by StorageVolume. Switch listeners over to
using the more robust RemoteCallbackList pattern under the hood.
Change external ASEC scanning logic in PackageManagerService to be
driven by listener events, instead of explicit MountService calls.
Bug:
19993667
Change-Id: I57c505de260ff1762a78d70d15f1892f40229210
Wale Ogunwale [Sat, 4 Apr 2015 18:53:14 +0000 (11:53 -0700)]
Dismiss recents to home without animation when resizing task.
Bug:
19946163
Change-Id: I87441e03556d775119f851f7ad49368fc1be49f7
Jeff Sharkey [Sat, 4 Apr 2015 21:41:26 +0000 (21:41 +0000)]
Merge "Parcelable objects for Disk/Volume."
Jeff Sharkey [Sat, 4 Apr 2015 00:14:45 +0000 (17:14 -0700)]
Parcelable objects for Disk/Volume.
Will eventually be used by SystemUI and/or Settings.
Also fix SettingsProvider NPE.
Bug:
19993667,
19909433
Change-Id: Ie326849ac5f43ee35f728d9cc0e332b72292db70
Barnaby James [Fri, 3 Apr 2015 00:49:54 +0000 (17:49 -0700)]
Intents for Voice controlled settings actions.
Add new voice interaction intents for battery saver mode, airplane mode and do not disturb.
Change-Id: Id5bd4e4f23a798eef91d797ffcd17df482b30c08
Wale Ogunwale [Sat, 4 Apr 2015 18:07:06 +0000 (18:07 +0000)]
Merge "Don't remove task from recents when moving task to another stack."
Olawale Ogunwale [Sat, 4 Apr 2015 16:48:47 +0000 (16:48 +0000)]
am
6491923d: am
972099c7: am
1d359daa: Merge "Remove the window whose client process has died or become zombie"
* commit '
6491923d047be80e073941efb70c4c46c81d1410':
Remove the window whose client process has died or become zombie
Olawale Ogunwale [Sat, 4 Apr 2015 16:39:28 +0000 (16:39 +0000)]
am
972099c7: am
1d359daa: Merge "Remove the window whose client process has died or become zombie"
* commit '
972099c752d97ed8235eab59cabc7f722c7fab95':
Remove the window whose client process has died or become zombie
Olawale Ogunwale [Sat, 4 Apr 2015 16:29:32 +0000 (16:29 +0000)]
am
1d359daa: Merge "Remove the window whose client process has died or become zombie"
* commit '
1d359daa607042417d095aaa83b78befc1b5f8a3':
Remove the window whose client process has died or become zombie
Olawale Ogunwale [Sat, 4 Apr 2015 16:12:39 +0000 (16:12 +0000)]
Merge "Remove the window whose client process has died or become zombie"
Wale Ogunwale [Fri, 3 Apr 2015 15:19:12 +0000 (08:19 -0700)]
Don't remove task from recents when moving task to another stack.
Also, made event log reason for remove task when moving different
from when removing.
Bug:
19946163
Change-Id: Iea2b7a84040759e9ad0a7dc8c6f4aee67b15467b
Geoff Mendal [Sat, 4 Apr 2015 09:27:39 +0000 (09:27 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 4 Apr 2015 09:21:54 +0000 (09:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 4 Apr 2015 07:52:43 +0000 (00:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1ed8d0ce4d4f7f65c764a2269e2e8a24ceffee4d
Auto-generated-cl: translation import
Geoff Mendal [Sat, 4 Apr 2015 06:11:11 +0000 (23:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I708bbbdb8c4276b3884a5c9f9e257f49de84f219
Auto-generated-cl: translation import
Geoff Mendal [Sat, 4 Apr 2015 06:06:11 +0000 (06:06 +0000)]
am
4c3689a2: (-s ours) am
8dda89ca: (-s ours) am
bad1356b: (-s ours) Import translations. DO NOT MERGE
* commit '
4c3689a25334d9d5502778738209cdfc5e26e08e':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 4 Apr 2015 05:55:38 +0000 (05:55 +0000)]
am
8dda89ca: (-s ours) am
bad1356b: (-s ours) Import translations. DO NOT MERGE
* commit '
8dda89cae7a7ff846ba03cbf6cb0d3434b473c4b':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 4 Apr 2015 05:51:57 +0000 (05:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 4 Apr 2015 05:51:30 +0000 (22:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaeb14afbbba8c976399110e09e898a4708cf6437
Auto-generated-cl: translation import
Geoff Mendal [Sat, 4 Apr 2015 05:50:26 +0000 (05:50 +0000)]
am
06bcd0c7: (-s ours) Import translations. DO NOT MERGE
* commit '
06bcd0c72b7f8af9033942fe147d76aa89e83b49':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 4 Apr 2015 05:45:10 +0000 (05:45 +0000)]
am
bad1356b: (-s ours) Import translations. DO NOT MERGE
* commit '
bad1356b2d2a229c57160af77aab78be5d3adb49':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 4 Apr 2015 05:39:15 +0000 (22:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4469eb735357257825c04e1796db3bbe3f9f00eb
Auto-generated-cl: translation import
Geoff Mendal [Sat, 4 Apr 2015 05:35:22 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13a822578c3b71e3176704891486783770337b97
Auto-generated-cl: translation import
Geoff Mendal [Sat, 4 Apr 2015 05:32:08 +0000 (22:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie0d2764cd9e3289d56cc994a2a45f6f67b5ed1e6
Auto-generated-cl: translation import
Andreas Gampe [Sat, 4 Apr 2015 05:02:27 +0000 (05:02 +0000)]
am
f29be77f: am
a4f39ed9: am
f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"
* commit '
f29be77f07084e88ae7104a375a1a54fd91de0dd':
Frameworks/base: Pass variant and feature-set to runtime
Andreas Gampe [Sat, 4 Apr 2015 04:52:36 +0000 (04:52 +0000)]
am
a4f39ed9: am
f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"
* commit '
a4f39ed91c9e17e1f165ed747c02d8f305b067ec':
Frameworks/base: Pass variant and feature-set to runtime
Andreas Gampe [Sat, 4 Apr 2015 04:41:06 +0000 (04:41 +0000)]
am
f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"
* commit '
f8cb672f121495e4f80b96a14140180f71e770fe':
Frameworks/base: Pass variant and feature-set to runtime
Andreas Gampe [Sat, 4 Apr 2015 04:23:11 +0000 (04:23 +0000)]
Merge "Frameworks/base: Pass variant and feature-set to runtime"
Quddus Chong [Sat, 4 Apr 2015 01:27:53 +0000 (01:27 +0000)]
am
6f403e69: am
d093ad1a: am
7abeba63: am
0d53fcad: am
d642f829: am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
6f403e695163a03fcaff8fd32e2c007aa0268e7f':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Rom Lemarchand [Sat, 4 Apr 2015 01:13:44 +0000 (01:13 +0000)]
Merge "Change audio include path from system/core to system/media/audio"
Quddus Chong [Sat, 4 Apr 2015 01:13:22 +0000 (01:13 +0000)]
am
d093ad1a: am
7abeba63: am
0d53fcad: am
d642f829: am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
d093ad1af148a6b5b444cf6cf18b865cad731365':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Quddus Chong [Sat, 4 Apr 2015 00:59:39 +0000 (00:59 +0000)]
am
7abeba63: am
0d53fcad: am
d642f829: am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
7abeba63b59b81a4b5d8a3edd1c54cbb037945fc':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Quddus Chong [Sat, 4 Apr 2015 00:49:49 +0000 (00:49 +0000)]
am
0d53fcad: am
d642f829: am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
0d53fcadce010d50f815a007d50f0b7f7d3bce4d':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Quddus Chong [Sat, 4 Apr 2015 00:39:10 +0000 (00:39 +0000)]
am
d642f829: am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
d642f8297529b3df96d0f822b062cb8354c90c18':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Quddus Chong [Sat, 4 Apr 2015 00:29:11 +0000 (00:29 +0000)]
am
54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* commit '
54dee349976eaafe7df3a2bb48e9fce2b964a7f0':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Quddus Chong [Sat, 4 Apr 2015 00:06:28 +0000 (17:06 -0700)]
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
Change-Id: I0e2a49b639101a7607e8e90cf830d9d449ad6328
John Spurlock [Fri, 3 Apr 2015 23:53:03 +0000 (23:53 +0000)]
Merge "Zen: Changes to support new automation settings sub-section."
Joseph Cooper [Fri, 3 Apr 2015 23:35:39 +0000 (23:35 +0000)]
Merge "Documents the ImageView.ScaleType attributes"
Andreas Gampe [Fri, 3 Apr 2015 06:12:56 +0000 (23:12 -0700)]
Frameworks/base: Pass variant and feature-set to runtime
This is required so we pick up the settings correctly when compiling
the boot image on device, or compile any dex files through a
DexClassLoader.
Bug:
20055104
Change-Id: Ia3ab2e48855060894b36f7fd360fe17b978e45a6
Luan Nguyen [Fri, 3 Apr 2015 22:54:37 +0000 (22:54 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Luan Nguyen [Fri, 3 Apr 2015 22:54:26 +0000 (22:54 +0000)]
am
88de9c94: am
b0c35f80: am
31947438: am
9b9bda56: am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
88de9c94eb519f4c69ac7489879eddf7753276b6':
docs: Remove note about inablity to submit apps to Google Play.
Jean-Michel Trivi [Fri, 3 Apr 2015 22:54:22 +0000 (22:54 +0000)]
Merge "AudioTrack builder API."
Luan Nguyen [Fri, 3 Apr 2015 22:43:25 +0000 (22:43 +0000)]
am
b0c35f80: am
31947438: am
9b9bda56: am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
b0c35f80f6efd61c553cc4bfc21b896dd5dc27e6':
docs: Remove note about inablity to submit apps to Google Play.
Wei Jia [Fri, 3 Apr 2015 22:36:38 +0000 (22:36 +0000)]
Merge "MediaSync: add MediaSync JAVA API"
Wei Jia [Mon, 9 Mar 2015 23:38:25 +0000 (16:38 -0700)]
MediaSync: add MediaSync JAVA API
Bug:
19666434
Change-Id: Iab6941f6d81cb95a3b86be14b239287acb0d0eee
Jean-Michel Trivi [Wed, 1 Apr 2015 16:40:11 +0000 (09:40 -0700)]
AudioTrack builder API.
Add a Builder class for AudioTrack.
Bug
19699343
Change-Id: I65cbcb32242c3d1857e5fca1a2f1dbe58c3b25ed
Luan Nguyen [Fri, 3 Apr 2015 22:28:45 +0000 (22:28 +0000)]
am
31947438: am
9b9bda56: am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
3194743890db9337412acf77edfc6924ba1dec6e':
docs: Remove note about inablity to submit apps to Google Play.
Mike Lockwood [Fri, 3 Apr 2015 22:19:13 +0000 (15:19 -0700)]
Add MidiManager and MidiDevice classes to public API.
Somehow we missed these two when we made the rest of the MIDI Manager public
Change-Id: I08e94762e155aa6a7f98bd05b363aee5e4744061
Joseph Cooper [Fri, 3 Apr 2015 21:00:31 +0000 (14:00 -0700)]
Documents the ImageView.ScaleType attributes
Although the ImageView.ScaleType enum is documented, that
documentation was not reproduced in the xml attributes. Copying the
documentation across should fill the previously empty 'Description'
column in
http://developer.android.com/reference/android/R.attr.html#scaleType
and
http://developer.android.com/reference/android/widget/ImageView.html#attr_android:scaleType
Also adds javadocs to ImageView.setImageMatrix(Matrix) because the
ScaleType documentation refers to it and it was also empty.
Change-Id: I7768549970eab2ebfe38cc4677a58dc91e104588
Rom Lemarchand [Fri, 3 Apr 2015 22:11:28 +0000 (15:11 -0700)]
Change audio include path from system/core to system/media/audio
Change-Id: Iefd5933e7ba10fa2a8ca3489bcbee3bc8f1396ad
Luan Nguyen [Fri, 3 Apr 2015 22:11:14 +0000 (22:11 +0000)]
am
9b9bda56: am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
9b9bda56238feabb07b7f6f0ad93f007c24de25d':
docs: Remove note about inablity to submit apps to Google Play.
George Mount [Fri, 3 Apr 2015 20:44:02 +0000 (13:44 -0700)]
Reset transitionAlpha when the transition is stopped early.
Bug
19273502
When a transition runs several animators and is interrupted,
some animators may not have been started. Those animators
that haven't been started will not reset their contents
the same as if the animator was canceled. Fade modifies
transitionAlpha and if it is interrupted prior to the
animator starting, the transitionAlpha doesn't get reset.
Change-Id: I8a49b4fbb7151aadc43d7b10e6acbae9578e5cc4
Luan Nguyen [Fri, 3 Apr 2015 22:01:12 +0000 (22:01 +0000)]
am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
b7647017ddf8f57c7333b5ae3e459639ef0a6a7c':
docs: Remove note about inablity to submit apps to Google Play.
Quddus Chong [Fri, 3 Apr 2015 21:49:43 +0000 (21:49 +0000)]
am
b3c310b6: am
ba386b55: am
f2c2be78: am
d9e2c05d: am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
b3c310b60dfab11b9b8d41b00ae06a82090f3d14':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Luan Nguyen [Fri, 3 Apr 2015 21:49:32 +0000 (21:49 +0000)]
am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
eeb42053df94de88674caf904a96ec987d55e668':
docs: Remove note about inablity to submit apps to Google Play.
Luan Nguyen [Fri, 3 Apr 2015 21:40:52 +0000 (21:40 +0000)]
Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
Quddus Chong [Fri, 3 Apr 2015 21:39:58 +0000 (21:39 +0000)]
am
ba386b55: am
f2c2be78: am
d9e2c05d: am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
ba386b55d6c5a8e19023e93bc281d282951371a7':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Quddus Chong [Fri, 3 Apr 2015 21:29:44 +0000 (21:29 +0000)]
am
f2c2be78: am
d9e2c05d: am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
f2c2be78ba26793c05dab7c77c84566265bb6668':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Joe LaPenna [Fri, 3 Apr 2015 21:29:09 +0000 (21:29 +0000)]
am
97a73606: am
e59f4260: am
1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
* commit '
97a7360660dc6473286a12d72eecff277e6182e1':
Make burn in protection updates happen on the minute.
Andrew Lee [Fri, 3 Apr 2015 21:24:06 +0000 (21:24 +0000)]
Merge "Protect against null ITelephony to fix crash."
Nancy Chen [Fri, 3 Apr 2015 21:23:37 +0000 (21:23 +0000)]
Merge "Include the source package in the voicemail URI."
Quddus Chong [Fri, 3 Apr 2015 21:19:15 +0000 (21:19 +0000)]
am
d9e2c05d: am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
d9e2c05dbf6c6f418b08a8465f1ed8f051015b41':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Joe LaPenna [Fri, 3 Apr 2015 21:13:30 +0000 (21:13 +0000)]
am
e59f4260: am
1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
* commit '
e59f426050f693b62bb5471fca5fb8b7ea2af8ea':
Make burn in protection updates happen on the minute.
Andrew Lee [Fri, 3 Apr 2015 21:09:29 +0000 (14:09 -0700)]
Protect against null ITelephony to fix crash.
Bug:
20066803
Change-Id: I4336e979dab3a4b1b3d53078af572ff3f822377a
Quddus Chong [Fri, 3 Apr 2015 21:08:49 +0000 (21:08 +0000)]
am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
0c3b894c2c18b226f58af98569f21bcb4a593b14':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Ben Kwa [Fri, 3 Apr 2015 21:06:29 +0000 (21:06 +0000)]
Merge "Enable directory selection. Add an IntentService to copy files."
Ye Wen [Fri, 3 Apr 2015 21:03:52 +0000 (21:03 +0000)]
Merge "Return pending intent to service caller if MmsService can't be connected"
Joe LaPenna [Fri, 3 Apr 2015 21:03:33 +0000 (21:03 +0000)]
am
1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
* commit '
1f956e424320b22255f293e9b6d7d0b30b19a79f':
Make burn in protection updates happen on the minute.