OSDN Git Service
Yorke Lee [Tue, 21 Apr 2015 21:49:30 +0000 (21:49 +0000)]
Merge "Make CAPABILITY_CAN_PAUSE_VIDEO public"
Chris Craik [Tue, 21 Apr 2015 21:47:26 +0000 (21:47 +0000)]
Merge "More state cleanup in View#draw"
Chris Craik [Tue, 21 Apr 2015 21:07:10 +0000 (14:07 -0700)]
More state cleanup in View#draw
bug:
20254728
Change-Id: I988077aac59165dd1fcb3ebbcd5abded586256b5
Christopher Tate [Mon, 20 Apr 2015 23:09:48 +0000 (16:09 -0700)]
Compress the preferred-app backup payloads
They can be Very Very Large, so take advantage of the new BlobBackupHelper
infrastructure to keep them tiny!
Also fix an issue in which the restore path wasn't properly passing
notification payloads along for processing, and an issue in which the
blob helper wasn't handling empty states properly.
Change-Id: I11a7ca3cd2e26f634a8971e874ac97385b0b500c
Jinsuk Kim [Tue, 21 Apr 2015 21:12:29 +0000 (21:12 +0000)]
Merge "CEC: Prevent premature standby process completion"
ztenghui [Tue, 21 Apr 2015 21:03:10 +0000 (21:03 +0000)]
Merge "Reset the Node status when clone."
Mike Lockwood [Tue, 21 Apr 2015 20:46:52 +0000 (20:46 +0000)]
Merge "BluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth MIDI timestamps"
Yorke Lee [Tue, 21 Apr 2015 20:42:24 +0000 (13:42 -0700)]
Make CAPABILITY_CAN_PAUSE_VIDEO public
Change-Id: If20f642a3d6bda886a68bb1e0ce459c38361a73c
Rachad [Tue, 21 Apr 2015 20:39:15 +0000 (20:39 +0000)]
Merge "Fix Build:"
Jeff Brown [Tue, 21 Apr 2015 20:38:13 +0000 (20:38 +0000)]
Merge "Make activity manager sleep top activity when dreaming."
Rachad [Tue, 21 Apr 2015 20:28:54 +0000 (13:28 -0700)]
Fix Build:
Add overloaded AudioTrack.write() to api/current.txt and api/system-current.txt
Change-Id: I5982e3c19c74dcde1df745137a9eed8ec32efa6a
Mike Lockwood [Tue, 21 Apr 2015 16:33:09 +0000 (09:33 -0700)]
BluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth MIDI timestamps
Also fixed some problems handling timestamp wrapping.
Change-Id: Ic0aefc54f2560425bea6d07ca0c4529d16699eaa
ztenghui [Tue, 21 Apr 2015 20:00:08 +0000 (13:00 -0700)]
Reset the Node status when clone.
b/
20457797
Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
Svet Ganov [Tue, 21 Apr 2015 19:52:10 +0000 (19:52 +0000)]
Merge "Add OP_READ_PHONE_STATE app op continued - framework"
Adrian Roos [Tue, 21 Apr 2015 19:47:42 +0000 (19:47 +0000)]
Merge "Clear emergency dialer task on launch"
Jeff Sharkey [Tue, 21 Apr 2015 19:44:59 +0000 (19:44 +0000)]
Merge "Blend in force adoptable flag when set."
Adrian Roos [Mon, 20 Apr 2015 20:57:06 +0000 (13:57 -0700)]
Clear emergency dialer task on launch
Bug:
20344056
Change-Id: Ic26f003acad3f9f91d772e5b4be8bd4b8aff5ec8
Rachad [Tue, 21 Apr 2015 19:29:43 +0000 (19:29 +0000)]
Merge "AudioTrack.write() with timestamp support"
Jeff Sharkey [Tue, 21 Apr 2015 19:14:03 +0000 (12:14 -0700)]
Blend in force adoptable flag when set.
Bug:
19993667
Change-Id: Ic7f348d171a89e889281b7efb1aa0cbade048975
Deepanshu Gupta [Tue, 21 Apr 2015 18:31:39 +0000 (18:31 +0000)]
Merge "Add resources to recyclerview dependency."
Deepanshu Gupta [Fri, 17 Apr 2015 00:58:37 +0000 (17:58 -0700)]
Add resources to recyclerview dependency.
Change-Id: I03c1dbacf8c83149de3ee01fe6d7dbb288d1948a
(cherry picked from commit
202cbbe45383b871129743d55179cf1c6429fffc)
Jim Miller [Tue, 21 Apr 2015 17:45:51 +0000 (17:45 +0000)]
Merge "Make fingerprint enroll/authenticate haptic feedback part of framework."
Chris Wren [Tue, 21 Apr 2015 17:24:30 +0000 (17:24 +0000)]
Merge "Add optional package context to sysui action metrics."
Chris Wren [Tue, 21 Apr 2015 16:34:02 +0000 (12:34 -0400)]
Add optional package context to sysui action metrics.
Bug:
20451514
Change-Id: I3c671d9aa05e02d66168211b77128443c544609d
Dan Sandler [Wed, 15 Apr 2015 15:02:54 +0000 (11:02 -0400)]
Rediscover your own notifications.
This new API, NotificationManager.getActiveNotifications(),
allows an app to recover the set of notifications it has
posted that are still active (un-cleared, un-canceled,
visible by the user). Along with the Notification object
you'll get the original tag and id you used to post it,
wrapped up in the somewhat awkwardly-named
StatusBarNotification data structure (previously only used
internally by NoMan/SysUI and NotificationListenerServices).
Bug:
17320461
Change-Id: I8cd610956fafed4e31526b663cebdc31231ad930
Andrei Kapishnikov [Tue, 21 Apr 2015 16:38:05 +0000 (16:38 +0000)]
Merge "Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag"
Chris Craik [Tue, 21 Apr 2015 16:30:07 +0000 (16:30 +0000)]
Merge "Rename native DisplayListRenderer to DisplayListCanvas"
Jae Seo [Tue, 21 Apr 2015 16:13:01 +0000 (16:13 +0000)]
Merge "TIF: Fix incorrect uses of INPUT_STATE_XXX"
Jae Seo [Mon, 20 Apr 2015 22:37:50 +0000 (15:37 -0700)]
TIF: Fix incorrect uses of INPUT_STATE_XXX
Also changed TvInputManager.getTvInputState to return
INPUT_STATE_DISCONNECTED for removed inputs and fixed documentation.
Bug:
18563677, Bug:
20435950
Change-Id: Idb81cee852b797eb3f5113d68468905f327928e7
Wei Jia [Tue, 21 Apr 2015 16:02:57 +0000 (16:02 +0000)]
Merge "MediaSync: update code example for setCallback."
Luan Nguyen [Tue, 21 Apr 2015 15:59:24 +0000 (15:59 +0000)]
am
2da31b1e: am
886e8e11: am
2fdd83a9: am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
2da31b1ef75f239ee33fea4592cbf0159a0af8b4':
docs: Add Channel API summary for Wear.
Luan Nguyen [Tue, 21 Apr 2015 15:47:42 +0000 (15:47 +0000)]
am
886e8e11: am
2fdd83a9: am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
886e8e1137fa7acad558c297891e61c20b43b036':
docs: Add Channel API summary for Wear.
Craig Mautner [Tue, 21 Apr 2015 15:41:26 +0000 (15:41 +0000)]
am
da506ffa: am
14818725: am
80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit '
da506ffabadd551241e23aecf08e378e7d0f30b1':
Prevent infinite layout and wallpaper flashing
Luan Nguyen [Tue, 21 Apr 2015 15:35:41 +0000 (15:35 +0000)]
am
2fdd83a9: am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
2fdd83a97a0dd3de36264928ff42dcc0a098018f':
docs: Add Channel API summary for Wear.
Joseph Cooper [Tue, 21 Apr 2015 15:31:41 +0000 (15:31 +0000)]
Merge "Introduces navigation keycodes."
Craig Mautner [Tue, 21 Apr 2015 15:30:44 +0000 (15:30 +0000)]
am
14818725: am
80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit '
148187255ecaaaf6a35920f779fa6a171433ccd4':
Prevent infinite layout and wallpaper flashing
Luan Nguyen [Tue, 21 Apr 2015 15:24:36 +0000 (15:24 +0000)]
am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
d2545775568694c75c9589eaf7c894583e37de4e':
docs: Add Channel API summary for Wear.
Craig Mautner [Tue, 21 Apr 2015 15:19:06 +0000 (15:19 +0000)]
am
80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit '
80f99121ea96cdabea6260ab165e7183431be513':
Prevent infinite layout and wallpaper flashing
Luan Nguyen [Tue, 21 Apr 2015 15:12:51 +0000 (15:12 +0000)]
am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
4c20df0bbec2774e8829245547cfe8a42c5faea7':
docs: Add Channel API summary for Wear.
Andrei Kapishnikov [Thu, 2 Apr 2015 19:21:20 +0000 (15:21 -0400)]
Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag
A new flag for DPM.resetPassword() method that specifies that the
device should be decrypted without asking for the password or pattern.
Bug
19250601
Related CL in Settings App: https://googleplex-android-review.git.corp.google.com/#/c/670206
Change-Id: I9ca3472dc18e66e618ff772dee16ca4a450e9997
Luan Nguyen [Tue, 21 Apr 2015 15:00:56 +0000 (15:00 +0000)]
am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
docs: Add Channel API summary for Wear.
Craig Mautner [Tue, 21 Apr 2015 14:54:42 +0000 (14:54 +0000)]
Merge "Prevent infinite layout and wallpaper flashing"
Luan Nguyen [Tue, 21 Apr 2015 14:53:02 +0000 (14:53 +0000)]
Merge "docs: Add Channel API summary for Wear." into lmp-docs
Dan Sandler [Tue, 21 Apr 2015 14:31:39 +0000 (14:31 +0000)]
Merge "Fix build."
Robin Lee [Tue, 21 Apr 2015 14:30:54 +0000 (14:30 +0000)]
Merge "SecurityController: track VPN for all users"
Robin Lee [Thu, 16 Apr 2015 16:01:49 +0000 (17:01 +0100)]
SecurityController: track VPN for all users
Fixes inconsistencies when switching users.
Bug:
17763561
Bug:
17506956
Bug:
18419023
Change-Id: I65988e6c45afd00a402d1e266922d5648fd12743
Dan Sandler [Tue, 21 Apr 2015 14:24:32 +0000 (10:24 -0400)]
Fix build.
Change-Id: I0e419fdb36cedba67fc6da7f71134d9728f66150
Dan Sandler [Tue, 21 Apr 2015 14:10:17 +0000 (14:10 +0000)]
Merge "Add ashmem stats to Parcels."
Thiemo Nagel [Tue, 21 Apr 2015 11:29:29 +0000 (11:29 +0000)]
Merge "Remove unsed failedAttemptWarning in reportFailedUnlockAttempt()."
Erik Kline [Tue, 21 Apr 2015 06:20:58 +0000 (15:20 +0900)]
Final removal of CONNECTIVITY_ACTION_IMMEDIATE.
Since the demise of the connectivity change delay,
CONNECTIVITY_ACTION_IMMEDIATE has been sent out back to back with
CONNECTIVITY_ACTION.
Interested parties should watch for CONNECTIVITY_ACTION.
Bug:
20013379
Change-Id: I072dddf95adb3bbd17fa1f7159d4ea848ade8f19
Erik Kline [Tue, 21 Apr 2015 06:06:41 +0000 (06:06 +0000)]
Merge "Listen for CONNECTIVITY_ACTION instead of _IMMEDIATE"
Andreas Gampe [Tue, 21 Apr 2015 04:47:39 +0000 (04:47 +0000)]
am
3bbd87dd: am
1f4f92ed: am
b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
* commit '
3bbd87dd1f6b7f6b767885a56ad062897bb25642':
Frameworks/base: Use better Class.forName in ZygoteInit
Andreas Gampe [Tue, 21 Apr 2015 04:36:27 +0000 (04:36 +0000)]
am
1f4f92ed: am
b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
* commit '
1f4f92ed7401b1bb2a1cacb5d82122729357d133':
Frameworks/base: Use better Class.forName in ZygoteInit
Erik Kline [Tue, 21 Apr 2015 04:09:15 +0000 (13:09 +0900)]
Listen for CONNECTIVITY_ACTION instead of _IMMEDIATE
I missed this in yesterday's reaping of CONNECTIVITY_ACTION_IMMEDIATE.
Bug:
20013379
Change-Id: I6a7a0b76c1e2d183d9357ecf912ebb6dc0a5c08f
Andreas Gampe [Tue, 21 Apr 2015 04:26:53 +0000 (04:26 +0000)]
am
b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
* commit '
b6feabcfce080c2dc906434cf05ff606489cf39d':
Frameworks/base: Use better Class.forName in ZygoteInit
Andreas Gampe [Tue, 21 Apr 2015 04:01:59 +0000 (04:01 +0000)]
Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
Daichi Hirono [Tue, 21 Apr 2015 03:56:18 +0000 (03:56 +0000)]
Merge "DocumentsUI: Save source file list into BaseActivity.State."
Andreas Gampe [Tue, 21 Apr 2015 02:16:37 +0000 (19:16 -0700)]
Frameworks/base: Use better Class.forName in ZygoteInit
Use the three-argument version of Class.forName. This saves an
expensive stack lookup for the caller's class-loader on each
invocation.
Bug:
19498458
Change-Id: I859affde31e580fd2de3f70ee0a9295936c2d9f4
Jim Miller [Tue, 21 Apr 2015 02:04:21 +0000 (19:04 -0700)]
Make fingerprint enroll/authenticate haptic feedback part of framework.
Change-Id: Icc2e9ec4b30a6f3a21e3bbe8476efc56361d6944
Sunny Goyal [Tue, 21 Apr 2015 00:40:23 +0000 (00:40 +0000)]
Merge "Potential fix for apps disappearing in launcher on system server crash"
Alan Viverette [Tue, 21 Apr 2015 00:29:34 +0000 (00:29 +0000)]
Merge "Update the popup reveal animation to more closely match window reveal"
Wei Jia [Tue, 21 Apr 2015 00:28:58 +0000 (17:28 -0700)]
MediaSync: update code example for setCallback.
Bug:
19666434
Change-Id: I03c16e94c6bdf531426a9b0ccd09c82a76daf009
Jason Monk [Tue, 21 Apr 2015 00:02:57 +0000 (00:02 +0000)]
Merge "SysUI: Stop wifi scanning so much"
Rubin Xu [Mon, 20 Apr 2015 23:56:26 +0000 (23:56 +0000)]
Merge "Rename public OTA policy APIs in DevicePolicyManager"
Quddus Chong [Mon, 20 Apr 2015 23:53:12 +0000 (23:53 +0000)]
am
3b6883b8: am
8cde8f7f: am
b1c838e0: am
6f142008: am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
3b6883b8054ffad5b3cc845552d09bfe673cb889':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Mon, 20 Apr 2015 23:42:39 +0000 (23:42 +0000)]
am
8cde8f7f: am
b1c838e0: am
6f142008: am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
8cde8f7f1ed1334dba58a62fc6fd3077f72ced96':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Chris Craik [Mon, 20 Apr 2015 23:40:22 +0000 (23:40 +0000)]
Merge "Simplify TaskManager fallback path"
Quddus Chong [Mon, 20 Apr 2015 23:29:30 +0000 (23:29 +0000)]
am
b1c838e0: am
6f142008: am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
b1c838e03bf9f828e59deed57a7e7445cc2ad9e8':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Mon, 20 Apr 2015 23:15:17 +0000 (23:15 +0000)]
am
6f142008: am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
6f14200880a79a9813f3448c15fe7097c3b7733b':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Mon, 20 Apr 2015 23:03:32 +0000 (23:03 +0000)]
am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
220f360e02ae833fcadc342756932f76f6780626':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Mon, 20 Apr 2015 22:51:40 +0000 (22:51 +0000)]
am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
900831f303beb4a67a871d969ac822d8b6d36460':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Rubin Xu [Mon, 20 Apr 2015 16:43:48 +0000 (17:43 +0100)]
Rename public OTA policy APIs in DevicePolicyManager
Use the term "SystemUpdate" instead of "OTA", in public
DevicePolicyManager APIs that handle OTA policies.
Bug:
19650524
Change-Id: Iebdaea91337d617147cb411b6f47e0f3fae8671c
Selim Cinek [Mon, 20 Apr 2015 22:23:00 +0000 (22:23 +0000)]
Merge "Made StackScrollAlgorithm HUN logic only depend on children"
Raph Levien [Mon, 20 Apr 2015 22:13:47 +0000 (22:13 +0000)]
Merge "Add Paint methods for cursor positioning"
John Reck [Mon, 20 Apr 2015 22:07:42 +0000 (22:07 +0000)]
Merge "Revert "Change how Java Bitmaps are accessed in a few places""
John Reck [Mon, 20 Apr 2015 22:06:31 +0000 (22:06 +0000)]
Revert "Change how Java Bitmaps are accessed in a few places"
Bug:
20207616
This reverts commit
a771b9861d11671c780092d35c0062eeefcf37c0.
Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
Jinsuk Kim [Mon, 20 Apr 2015 04:17:13 +0000 (13:17 +0900)]
CEC: Prevent premature standby process completion
Handles the situation where standby is prematurely completed
by handleTerminateArc initiated in HdmiCecLocalDeviceTv.disableDevice().
Power status is now checked to stop the flow before removing
RequestArcTerminateAction which can call mPendingActionClearedCallback.
Also Make sure mPendingActionClearedCallback is set to null at the beginning
so that disable callback is not invoked unintentionally in
HdmiCecLocalDevice.checkIfPendingActionsCleared() which is supposed to work
at standby process only. It is now invoked by handleDisableDeviceTimeout
to make sure standby process is completed with PendingActionClearedCallback
at HdmiControlService.onStandby().
Bug:
20159835, Bug:
19930352
Change-Id: Iac29dfb6acff76182ff4e9563edc611406c23f3c
Chris Craik [Mon, 20 Apr 2015 21:54:49 +0000 (14:54 -0700)]
Simplify TaskManager fallback path
Change-Id: Ie3833449f7fe6aa69b9f71eb8bab1bef0fe434aa
Selim Cinek [Mon, 20 Apr 2015 21:27:54 +0000 (14:27 -0700)]
Made StackScrollAlgorithm HUN logic only depend on children
A racecondition could trigger that the two states where not in sync
anymore. We now only rely on the ordering of the children.
Bug:
20421801
Change-Id: I3b607adb3b4b22f04f465d5e5e23f6e514c35ef9
Christopher Tate [Mon, 20 Apr 2015 21:22:37 +0000 (21:22 +0000)]
Merge "Infrastructure for notification backup/restore"
Chris Craik [Mon, 20 Apr 2015 20:34:45 +0000 (13:34 -0700)]
Rename native DisplayListRenderer to DisplayListCanvas
Change-Id: I33e6f8cc85da1e7da7ff7bf18d4ebde64222067a
Christopher Tate [Wed, 8 Apr 2015 21:35:43 +0000 (14:35 -0700)]
Infrastructure for notification backup/restore
Introduce a fairly general "store byte[] blobs as backup keys" helper, and
use that to integrate with the Notification Manager. The helper provides all
the machinery of managing prior state, compressing the blob on the wire, etc.
Bug
19848954
Bug
20105530
Bug
17755700
Change-Id: I4aa808172244af6db0ab2f4440cc266a797655d7
Quddus Chong [Fri, 17 Apr 2015 22:01:16 +0000 (15:01 -0700)]
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2.
bug:
20304402
Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
Sunny Goyal [Mon, 20 Apr 2015 19:44:08 +0000 (12:44 -0700)]
Potential fix for apps disappearing in launcher on system server crash
Based on Ifda3fda209141b361a286fc033217acfa0ec196e
Bug:
20420558
Change-Id: Icfcaf585b8a19853fe2c0fd0e4f06a2efc087938
Jason Monk [Mon, 20 Apr 2015 20:38:51 +0000 (16:38 -0400)]
SysUI: Stop wifi scanning so much
Seems that QS to end up in a listening state while the phone is sleeping
so switch scanning to only happen while the detail panel is showing.
Bug:
20137092
Change-Id: Ib067531c8af75f9f93b10e087b6fc252b5e508fa
Selim Cinek [Mon, 20 Apr 2015 20:35:04 +0000 (20:35 +0000)]
Merge "Fixed a crash with HUN notifications"
Stuart Scott [Mon, 20 Apr 2015 20:16:23 +0000 (20:16 +0000)]
Merge "Fixing build break"
Tyler Gunn [Mon, 20 Apr 2015 20:12:43 +0000 (20:12 +0000)]
Merge "API Cleanup - rename IConferenceable to Conferenceable."
Svet Ganov [Mon, 20 Apr 2015 20:10:31 +0000 (20:10 +0000)]
Merge "Report all permissions for user in PermissionsState"
Svet Ganov [Mon, 20 Apr 2015 20:09:11 +0000 (13:09 -0700)]
Report all permissions for user in PermissionsState
Change-Id: I08a228018401820ef82cf1f95fe29556d3aeba5e
Selim Cinek [Mon, 20 Apr 2015 20:04:47 +0000 (13:04 -0700)]
Fixed a crash with HUN notifications
Bug:
20421801
Change-Id: Ifc4445e585d924388f0642379c5268b6bbfb2e99
Jonathan Basseri [Mon, 20 Apr 2015 19:59:37 +0000 (19:59 +0000)]
Merge "Add multi-sim support for getCarrierPackageNamesForIntent."
Abodunrinwa Toki [Mon, 20 Apr 2015 19:25:28 +0000 (19:25 +0000)]
Merge "Fix FloatingToolbar animation interruptions."
Alex Klyubin [Mon, 20 Apr 2015 18:56:22 +0000 (18:56 +0000)]
am
132617de: am
7b55b8f0: am
c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
* commit '
132617de897a1de256114c1a6cc3680983d37e84':
Make MediaPlayer fail fast on UnknownServiceException.
Alex Klyubin [Mon, 20 Apr 2015 18:45:05 +0000 (18:45 +0000)]
am
7b55b8f0: am
c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
* commit '
7b55b8f0563d540804b14c1643b0adfea19a71b1':
Make MediaPlayer fail fast on UnknownServiceException.
Alex Klyubin [Mon, 20 Apr 2015 18:34:05 +0000 (18:34 +0000)]
am
c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
* commit '
c77c14c23d5617b7e4d69dccff890f3b1b55b567':
Make MediaPlayer fail fast on UnknownServiceException.
Stuart Scott [Mon, 20 Apr 2015 18:33:06 +0000 (11:33 -0700)]
Fixing build break
Change-Id: I7ab3673627d1fda2d96a17c7e1823417fcb5cfef
Alex Klyubin [Mon, 20 Apr 2015 17:54:14 +0000 (17:54 +0000)]
Merge "Make MediaPlayer fail fast on UnknownServiceException."
Stuart Scott [Fri, 3 Apr 2015 01:00:02 +0000 (18:00 -0700)]
Move factoryReset to service and protect.
bug:
16161518
Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf
Junda Liu [Fri, 17 Apr 2015 00:18:07 +0000 (17:18 -0700)]
Add multi-sim support for getCarrierPackageNamesForIntent.
resbmit of change Id100b7c4606287a1daa90092cd3c8a5a6519247d
Bug:
20268073
Change-Id: I852aac4da492e15f1dd7a3c88693fa14ec07b7c4
OSDN Git Service
