OSDN Git Service
Jim Miller [Sat, 25 Apr 2015 00:25:53 +0000 (00:25 +0000)]
Merge "Don't use a WeakReference for fingerprint notification object."
Adrian Roos [Sat, 25 Apr 2015 00:18:21 +0000 (00:18 +0000)]
Merge "Smooth transitions between SHOW_WHEN_LOCKED activities"
Andy Hung [Sat, 25 Apr 2015 00:18:12 +0000 (00:18 +0000)]
Merge "Move channel index computation to native AudioTrack JNI"
Adrian Roos [Fri, 24 Apr 2015 23:03:47 +0000 (16:03 -0700)]
Smooth transitions between SHOW_WHEN_LOCKED activities
Bug:
12536117
Change-Id: Ia5f96e49587661440ae31fba17c42b2e3a9557fb
Jim Miller [Fri, 24 Apr 2015 23:59:11 +0000 (16:59 -0700)]
Don't use a WeakReference for fingerprint notification object.
This was causing a problem where a GC in the system process
would inadvertently remove the callback.
Potential fix for bug
20491119
Change-Id: I9d7d0bb8e29fcd6c52cb3be645bbb9c8e5413d48
Quddus Chong [Fri, 24 Apr 2015 23:53:59 +0000 (23:53 +0000)]
am
6c52d51c: am
bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug:
18025533
* commit '
6c52d51c65613beb23ea135e8a8374f6c2dc1bf8':
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug:
18025533
Adam Cohen [Fri, 24 Apr 2015 23:43:48 +0000 (23:43 +0000)]
Merge "Remove problematic early return from notifyDataSetChanged"
Adrian Roos [Fri, 24 Apr 2015 23:43:34 +0000 (23:43 +0000)]
Merge "Fix stale inKeyguardInputRestrictedMode"
Quddus Chong [Fri, 24 Apr 2015 23:43:49 +0000 (23:43 +0000)]
am
bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug:
18025533
* commit '
bbe5effb6682b4ba5e6accd9a226ec7611fe83dc':
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug:
18025533
Andy Hung [Fri, 24 Apr 2015 23:43:32 +0000 (23:43 +0000)]
Merge "Unhide new channel masks and deprecate old channel masks"
Jae Seo [Fri, 24 Apr 2015 23:41:19 +0000 (23:41 +0000)]
Merge "TIF: Add TvContentRating constant for unrated content"
Amith Yamasani [Fri, 24 Apr 2015 23:39:32 +0000 (23:39 +0000)]
Merge "More usage tracking"
Arunesh Mishra [Fri, 24 Apr 2015 23:29:38 +0000 (23:29 +0000)]
Merge "Add AudioManager property strings for ultrasound."
Quddus Chong [Fri, 24 Apr 2015 23:28:40 +0000 (16:28 -0700)]
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc.
bug:
18025533
Change-Id: I6379b2a7be495a506e0e428fe9c68fdbe197704b
Adam Cohen [Fri, 24 Apr 2015 22:39:45 +0000 (15:39 -0700)]
Remove problematic early return from notifyDataSetChanged
-> If connection to the service fails for whatever reason,
mNotifyDataSetChangedAfterOnServiceConnected can get stuck to true, preventing
future connections to the service. Don't let this prevent from connecting to the
service.
issue
19890339
Change-Id: I376101ae146359109df53add3a3202ba2e1e842d
Amith Yamasani [Fri, 17 Apr 2015 17:02:15 +0000 (10:02 -0700)]
More usage tracking
Notification listeners can now report that a notification
has been seen by the user and that package is then marked
as active.
Bug:
20066058
Change-Id: I336040a52c44c21fd0d78b02ec9a19d448c64b40
Yorke Lee [Fri, 24 Apr 2015 23:11:41 +0000 (23:11 +0000)]
Merge "Add APIs to getDefaultDialerPackage and getSystemDialerPackage"
Andy Hung [Fri, 24 Apr 2015 02:28:38 +0000 (19:28 -0700)]
Move channel index computation to native AudioTrack JNI
Change-Id: I047a9dcce13a38c11da165607d668dfb9d7fa335
Adrian Roos [Fri, 24 Apr 2015 23:04:53 +0000 (16:04 -0700)]
Fix stale inKeyguardInputRestrictedMode
Bug:
20536027
Change-Id: Ica65b388ae2c58a45c66e9f30efa3fadeded8d47
Doris Liu [Fri, 24 Apr 2015 23:04:59 +0000 (23:04 +0000)]
Merge "Remove distance based animation duration API"
Fyodor Kupolov [Fri, 24 Apr 2015 23:02:41 +0000 (23:02 +0000)]
Merge "Added SystemServiceRegistry to preloaded-classes"
Seigo Nonaka [Fri, 24 Apr 2015 22:46:12 +0000 (22:46 +0000)]
Merge "Notify IME visibility when showWindow is called."
Zhijun He [Fri, 24 Apr 2015 22:38:46 +0000 (22:38 +0000)]
Merge "Image: fix build break"
Jens Ole Lauridsen [Fri, 24 Apr 2015 22:37:45 +0000 (22:37 +0000)]
Merge "parcel: Add efficient methods for writing and reading a parcelable."
Wale Ogunwale [Fri, 24 Apr 2015 22:35:34 +0000 (22:35 +0000)]
am
cc9c597d: am
d639a453: am
e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit '
cc9c597dad6d99242ed2903d8760922f66223401':
Revert "[ActivityManager] Improve multi-thread access the same provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:35:26 +0000 (22:35 +0000)]
am
4cdc7e84: am
e2047da6: am
d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit '
4cdc7e842d8b1ff1e70d2a0b4a2a1939fa116563':
Revert "Clean-up state if we have an exception when acquiring provider"
Zhijun He [Fri, 24 Apr 2015 22:29:21 +0000 (15:29 -0700)]
Image: fix build break
Change-Id: I51e91a6c370626603f79371c16c8a10195ba63da
Wale Ogunwale [Fri, 24 Apr 2015 22:26:08 +0000 (22:26 +0000)]
am
d639a453: am
e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit '
d639a4532417bf605f03b3b5efdb3a9e1cbe6661':
Revert "[ActivityManager] Improve multi-thread access the same provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:26:04 +0000 (22:26 +0000)]
am
e2047da6: am
d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit '
e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
Revert "Clean-up state if we have an exception when acquiring provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:15:02 +0000 (22:15 +0000)]
am
e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit '
e60077e62a441dbcc132b2abb35d998ab48d261c':
Revert "[ActivityManager] Improve multi-thread access the same provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:14:56 +0000 (22:14 +0000)]
am
d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit '
d9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
Revert "Clean-up state if we have an exception when acquiring provider"
Kenny Root [Fri, 24 Apr 2015 22:13:26 +0000 (22:13 +0000)]
am
6c1af7ea: am
8652bce1: am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
6c1af7ea497b1a2f04bdf45a19d2147f5b9665b9':
frameworks/base: switch to using NativeConstants.
Jae Seo [Fri, 24 Apr 2015 22:03:35 +0000 (22:03 +0000)]
Merge "TIF: Use Preconditions.checkNotNull for null checking"
Mike Lockwood [Fri, 24 Apr 2015 22:03:04 +0000 (22:03 +0000)]
Merge "UsbAlsaManager: Fix NPE when running in emulator"
Kenny Root [Fri, 24 Apr 2015 22:00:56 +0000 (22:00 +0000)]
am
8652bce1: am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
8652bce13765fb29329df2a4ccca4591bae28de5':
frameworks/base: switch to using NativeConstants.
Zhijun He [Fri, 24 Apr 2015 21:59:21 +0000 (21:59 +0000)]
Merge "ImageWriter: fix and cleanup the closed Image Handling"
Mike Lockwood [Fri, 24 Apr 2015 21:56:32 +0000 (14:56 -0700)]
UsbAlsaManager: Fix NPE when running in emulator
Bug:
20537358
Change-Id: I46693e45eb6127118cbd54fc3490dc58840b5797
Wale Ogunwale [Fri, 24 Apr 2015 21:49:45 +0000 (21:49 +0000)]
Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
Kenny Root [Fri, 24 Apr 2015 21:49:47 +0000 (21:49 +0000)]
am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
c71f264847eb75d53c0f99e6e1c42a8a1527d3b4':
frameworks/base: switch to using NativeConstants.
Wale Ogunwale [Fri, 24 Apr 2015 21:49:41 +0000 (21:49 +0000)]
Merge "Revert "Clean-up state if we have an exception when acquiring provider""
Lajos Molnar [Fri, 24 Apr 2015 21:40:52 +0000 (14:40 -0700)]
MediaSync: rename onReturnAudioBuffer to onAudioBufferConsumed
Bug:
19666434
Change-Id: I117d4a1ab29e5c8e02879d2321316b669c8e43ae
Wei Jia [Fri, 24 Apr 2015 21:46:22 +0000 (21:46 +0000)]
Merge "MediaSync: add OnErrorListener."
Wale Ogunwale [Fri, 24 Apr 2015 21:45:14 +0000 (14:45 -0700)]
Revert "[ActivityManager] Improve multi-thread access the same provider"
This reverts commit
57307b21cbdb261eeca081051ed61540dcf905f8.
Bug:
20091132
Wale Ogunwale [Fri, 24 Apr 2015 21:44:54 +0000 (14:44 -0700)]
Revert "Clean-up state if we have an exception when acquiring provider"
This reverts commit
73e239bdc9493d81215d5afe739b3ed095686ba2.
Bug:
20091132
Wei Jia [Fri, 24 Apr 2015 18:37:51 +0000 (11:37 -0700)]
MediaSync: add OnErrorListener.
Bug:
19666434
Change-Id: I34983d6101cc0f93ee74bdcec5d272808842a5c2
Andy Hung [Fri, 24 Apr 2015 06:50:28 +0000 (23:50 -0700)]
Unhide new channel masks and deprecate old channel masks
Change-Id: Ie95a38e782fe491ffc2f2670c2b9f52afb33abdd
Kenny Root [Fri, 24 Apr 2015 21:26:06 +0000 (21:26 +0000)]
Merge "frameworks/base: switch to using NativeConstants."
Alex Klyubin [Fri, 24 Apr 2015 21:25:31 +0000 (21:25 +0000)]
Merge "resolved conflicts for merge of
f9c14b7d to master"
Alex Klyubin [Fri, 24 Apr 2015 21:11:52 +0000 (14:11 -0700)]
resolved conflicts for merge of
f9c14b7d to master
Change-Id: Ifa29891b8ad7979cbc28c54180b9606bb1319ff0
Jonathan Basseri [Fri, 24 Apr 2015 21:20:50 +0000 (21:20 +0000)]
Merge "Never return a reference to sDefaults."
Xiyuan Xia [Fri, 24 Apr 2015 21:13:53 +0000 (21:13 +0000)]
Merge "Use fillColor for battery bolt color."
Rubin Xu [Fri, 24 Apr 2015 21:14:37 +0000 (21:14 +0000)]
Merge "Add missing permission check in MountService"
Quddus Chong [Fri, 24 Apr 2015 21:09:27 +0000 (21:09 +0000)]
am
94089591: am
9774e8ab: Merge "docs: Updated What\'s New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
* commit '
9408959144d72d72afe89c3cf3de3d3d556a58b5':
docs: Updated What's New for GMS v7.3 to remove Maps support for Wear.
Scott Rowe [Fri, 24 Apr 2015 21:08:52 +0000 (21:08 +0000)]
am
eec5463c: am
5e95a917: am
17c0b254: am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
eec5463cb9617d6f2eee43cbf1fe35deaad30d90':
docs: Supported media protocols, codecs, formats for Android TV
Alan Viverette [Fri, 24 Apr 2015 21:06:12 +0000 (21:06 +0000)]
Merge "Fix list selector background for Material spec"
Tony Mantler [Fri, 24 Apr 2015 21:04:22 +0000 (21:04 +0000)]
Merge "Add totalSize and availSize queries to StorageMeasurement"
Simranjit Singh Kohli [Fri, 24 Apr 2015 21:00:04 +0000 (21:00 +0000)]
Merge "[Fix confirmCredntials flow]"
Alan Viverette [Fri, 24 Apr 2015 20:47:07 +0000 (13:47 -0700)]
Fix list selector background for Material spec
Bug:
20557738
Change-Id: Id0aa7e5dc1d5ddce83f9ef0e128ae5a97e9a06fb
Simranjit Singh Kohli [Fri, 10 Apr 2015 00:27:06 +0000 (17:27 -0700)]
[Fix confirmCredntials flow]
This CL contains 2 fixes:
1. On a successfult confirm credential, lastAuthenticatedTime was
not getting updated. This gets fixed.
2. Historically, confirmCredential used to work for accounts NOT on
the device. Setting lastAuthenticated time only for existing
accounts and preventing crash if account is not on the device.
Bug:
20141809
Change-Id: I301d49cbc4a594af6110366ef6f55350f74d250d
Xiyuan Xia [Fri, 24 Apr 2015 20:53:33 +0000 (13:53 -0700)]
Use fillColor for battery bolt color.
Bug:
20178901
Change-Id: I19b1de98ece6681f5dd0a15a35f55fb88e4c2cfc
Wale Ogunwale [Fri, 24 Apr 2015 20:47:25 +0000 (20:47 +0000)]
Merge "Remove ZoomButtonsController view immediately when !visible"
Wale Ogunwale [Thu, 23 Apr 2015 23:49:16 +0000 (16:49 -0700)]
Remove ZoomButtonsController view immediately when !visible
When an acitvity with ZoomButtonsController is destorying all
its views are removed immediately except for the
ZoomButtonController view which is deferred. This causing the
system to think the window was leaked at the end of the current
clean-up pass since the view is still around. We now remove
the view immediately when setVisible(false) is called which is
the current signal that the window is detaching or the parent
view is now hidden.
Bug:
18280446
Change-Id: If566b402c2914a72539e28e4f6d768c6199f2d2f
Alex Klyubin [Fri, 24 Apr 2015 20:35:26 +0000 (20:35 +0000)]
am
b068ae14: am
e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
* commit '
b068ae143df2c2f3030da23d7fc130f735975867':
No runtime exceptions during normal use of AndroidKeyStore crypto.
Zhijun He [Wed, 22 Apr 2015 17:07:42 +0000 (10:07 -0700)]
ImageWriter: fix and cleanup the closed Image Handling
Attempting to access an Image after it is closed will result in an ISE.
Also fixed some minor doc issues.
Bug:
19872785
Change-Id: I91f037b2b2f243fcbd905d5a646b505bc9c10638
Fyodor Kupolov [Fri, 24 Apr 2015 20:34:00 +0000 (13:34 -0700)]
Added SystemServiceRegistry to preloaded-classes
SystemServiceRegistry class should be preloaded in the zygote.
Bug:
20559324
Change-Id: I3120c7e42b50c54213513a04d7135d745c8abd7c
Alex Klyubin [Fri, 24 Apr 2015 20:22:58 +0000 (20:22 +0000)]
am
e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
* commit '
e2b9bb45d20102f121660ed361bd4225852a55e0':
No runtime exceptions during normal use of AndroidKeyStore crypto.
Seigo Nonaka [Wed, 15 Apr 2015 09:31:32 +0000 (18:31 +0900)]
Notify IME visibility when showWindow is called.
To change the back icon, need to notify IME visibility to the
InputMethodManagerService when guest IME service calls showWindow().
IME can call showWindow() if it want to show software input, but it
doesn't send IME_VISIBLE state to the InputMethodManagerService,
hence the arrow icon is different from what we expect. This
typically happens when Latin IME shows Emoji panel by left-alt keys.
Bug:
20318050
Change-Id: I0ec2c71ad9bc3b7e9259d9180375d9062fc7e154
Amith Yamasani [Fri, 24 Apr 2015 20:03:01 +0000 (20:03 +0000)]
Merge "Add ability to get and set idle state of apps"
Arunesh Mishra [Fri, 24 Apr 2015 05:39:40 +0000 (22:39 -0700)]
Add AudioManager property strings for ultrasound.
Change-Id: Ia1bc257affdb5afe2b6a00bcca53651f924be7d2
Alex Klyubin [Fri, 24 Apr 2015 20:00:57 +0000 (20:00 +0000)]
Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
Amith Yamasani [Fri, 24 Apr 2015 03:36:41 +0000 (20:36 -0700)]
Add ability to get and set idle state of apps
Add am shell command to set and get idle
Add public API to check if an app is idle
Bug:
20534955
Bug:
20493806
Change-Id: Ib48b3fe847c71f05ef3905563f6e903cf060c498
Quddus Chong [Fri, 24 Apr 2015 19:56:39 +0000 (19:56 +0000)]
am
9774e8ab: Merge "docs: Updated What\'s New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
* commit '
9774e8ab0890d694840c883f309916a444b3ee54':
docs: Updated What's New for GMS v7.3 to remove Maps support for Wear.
Quddus Chong [Fri, 24 Apr 2015 19:48:03 +0000 (19:48 +0000)]
Merge "docs: Updated What's New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
Jae Seo [Fri, 24 Apr 2015 17:28:48 +0000 (10:28 -0700)]
TIF: Use Preconditions.checkNotNull for null checking
Bug:
19941047
Change-Id: Ib2b5d86d21ecc48888f9343a0e8f16b08fef6925
Alan Viverette [Fri, 24 Apr 2015 19:40:57 +0000 (19:40 +0000)]
Merge "Change direction of DPAD_LEFT and DPAD_RIGHT if LayoutDirection is RTL"
Jorn Jacobsson [Tue, 22 Jan 2013 13:55:53 +0000 (14:55 +0100)]
Change direction of DPAD_LEFT and DPAD_RIGHT if LayoutDirection is RTL
Changes the behaviour of onKeyDown for DPAD_LEFT/RIGHT when the
layoutDirection is RTL, to move the focus in the correct direction.
Change-Id: I889649788d1e6f347aed90d6683d9f4dd6807da0
Andy Hung [Fri, 24 Apr 2015 19:22:21 +0000 (19:22 +0000)]
Merge "Fix API level in documentation to refer to MNC"
Andy Hung [Fri, 24 Apr 2015 09:10:16 +0000 (02:10 -0700)]
Fix API level in documentation to refer to MNC
Change-Id: I2ab646fce1c3f58b11d88a47e733621d8f1fec79
Andy Hung [Fri, 24 Apr 2015 19:16:20 +0000 (19:16 +0000)]
Merge "Increase AudioTrack and AudioRecord max sample rate to 192kHz"
Tor Norbye [Fri, 24 Apr 2015 18:54:24 +0000 (18:54 +0000)]
Merge "Add permission requirement annotation for KeyGuard"
Scott Rowe [Fri, 24 Apr 2015 18:52:35 +0000 (18:52 +0000)]
am
5e95a917: am
17c0b254: am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
5e95a91707ecd53c1ab0eb688513a2328271f9a2':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 24 Apr 2015 18:43:03 +0000 (18:43 +0000)]
am
17c0b254: am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
17c0b25441a264efe87ab2db82c04c0e018c178c':
docs: Supported media protocols, codecs, formats for Android TV
Santos Cordon [Fri, 24 Apr 2015 18:37:37 +0000 (18:37 +0000)]
Merge "Fix up DisconnectCause description."
Santos Cordon [Fri, 24 Apr 2015 18:26:01 +0000 (11:26 -0700)]
Fix up DisconnectCause description.
Change-Id: Ib2b52b6f8bc8fe945df3684f4e1ed9e04f78b061
Alex Klyubin [Fri, 24 Apr 2015 18:35:37 +0000 (18:35 +0000)]
am
edf5454a: am
3167fb4b: am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
edf5454a14cc53de92eaf1ef15fcfb21d8caccca':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:35:29 +0000 (18:35 +0000)]
am
3846d3a4: am
6d856bfb: am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
3846d3a4c5d79a9d7e86e43c64a5c21a29036de0':
[ActivityManager] Avoid orphan ContentProviderRecord.
Scott Rowe [Fri, 24 Apr 2015 18:30:07 +0000 (18:30 +0000)]
am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
ccfedfccbe63af223027471ea80869d0fb011098':
docs: Supported media protocols, codecs, formats for Android TV
Leon Scroggins III [Fri, 24 Apr 2015 18:22:00 +0000 (18:22 +0000)]
am
fddbcd85: (-s ours) am
8be18bbf: am
4c1f70db: am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
fddbcd857fda28213917ef81375514bffc4a6d68':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 18:21:53 +0000 (18:21 +0000)]
am
38b84b6d: (-s ours) am
60d7c9fc: am
6db29a92: am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
38b84b6d765302c8325ad10109e43227ce8e8156':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Scott Rowe [Fri, 24 Apr 2015 18:21:42 +0000 (18:21 +0000)]
am
6a6bfe5e: am
6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
* commit '
6a6bfe5e84b598f24d73138523d7f8d88729daed':
docs: Supported media protocols, codecs, formats for Android TV
Alex Klyubin [Fri, 24 Apr 2015 18:21:22 +0000 (18:21 +0000)]
am
3167fb4b: am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
3167fb4b6e190705d21a76b34cc376a89675a6a0':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:21:19 +0000 (18:21 +0000)]
am
6d856bfb: am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
6d856bfba5b6ae488d49c4909510cd87000cd922':
[ActivityManager] Avoid orphan ContentProviderRecord.
Leon Scroggins III [Fri, 24 Apr 2015 18:16:34 +0000 (18:16 +0000)]
am
8be18bbf: am
4c1f70db: am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
8be18bbfc23b768ae3022f988e586871754958ac':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 18:16:29 +0000 (18:16 +0000)]
am
60d7c9fc: am
6db29a92: am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
60d7c9fcbcb80c556689f03c7b00984f94f9912b':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Scott Rowe [Fri, 24 Apr 2015 18:16:26 +0000 (18:16 +0000)]
am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
5827af11bdcd9973afe04cb035e83c6428d1e562':
docs: Supported media protocols, codecs, formats for Android TV
Yorke Lee [Thu, 23 Apr 2015 22:58:27 +0000 (15:58 -0700)]
Add APIs to getDefaultDialerPackage and getSystemDialerPackage
getDefaultDialerPackage is a public API and will be used by
apps to determine if they are the default dialer.
getSystemDialerPackage is a hidden API and is only used by
system components.
Also add new public string constants to allow apps to show
a dialog requesting that the user change the current default
dialer.
Bug:
20304458
Change-Id: I121d36741474c1fe171c372fb766a6c128228c9c
Alex Klyubin [Fri, 24 Apr 2015 18:11:50 +0000 (18:11 +0000)]
am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
71223ebe1b2264b7463a02c8dafd779eb3b8c210':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:11:29 +0000 (18:11 +0000)]
am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
cf7d2d95adb358a628c2622b43a999d3ab784406':
[ActivityManager] Avoid orphan ContentProviderRecord.
Scott Rowe [Fri, 24 Apr 2015 18:10:25 +0000 (18:10 +0000)]
am
6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
* commit '
6e5063fe88b265c89b39401545925b9e0cbd8390':
docs: Supported media protocols, codecs, formats for Android TV
Alan Viverette [Fri, 24 Apr 2015 18:06:48 +0000 (18:06 +0000)]
Merge "Implement RTL support in framework ViewPager, DatePicker"