Jae Seo
9677822097
Merge "TIF: Use Preconditions.checkNotNull for null checking"
2015-04-24 22:03:44 +00:00
Mike Lockwood
bbaf48b386
Merge "UsbAlsaManager: Fix NPE when running in emulator"
2015-04-24 22:03:06 +00:00
Zhijun He
18191b4a52
Merge "ImageWriter: fix and cleanup the closed Image Handling"
2015-04-24 21:59:21 +00:00
Mike Lockwood
1f13872a01
UsbAlsaManager: Fix NPE when running in emulator
...
Bug: 20537358
Change-Id: I46693e45eb6127118cbd54fc3490dc58840b5797
2015-04-24 14:56:32 -07:00
Lajos Molnar
e0112b51a1
MediaSync: rename onReturnAudioBuffer to onAudioBufferConsumed
...
Bug: 19666434
Change-Id: I117d4a1ab29e5c8e02879d2321316b669c8e43ae
2015-04-24 14:47:38 -07:00
Wei Jia
197b3daed7
Merge "MediaSync: add OnErrorListener."
2015-04-24 21:46:22 +00:00
Wei Jia
746306521a
MediaSync: add OnErrorListener.
...
Bug: 19666434
Change-Id: I34983d6101cc0f93ee74bdcec5d272808842a5c2
2015-04-24 14:32:36 -07:00
Alex Klyubin
878141321e
Merge "resolved conflicts for merge of f9c14b7d to master"
2015-04-24 21:25:33 +00:00
Alex Klyubin
40485f5aac
resolved conflicts for merge of f9c14b7d to master
...
Change-Id: Ifa29891b8ad7979cbc28c54180b9606bb1319ff0
2015-04-24 14:21:41 -07:00
Jonathan Basseri
0d16b908c3
Merge "Never return a reference to sDefaults."
2015-04-24 21:20:53 +00:00
Xiyuan Xia
cdce55aa14
Merge "Use fillColor for battery bolt color."
2015-04-24 21:14:42 +00:00
Rubin Xu
f8d26e24af
Merge "Add missing permission check in MountService"
2015-04-24 21:14:41 +00:00
Quddus Chong
3a344962d5
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.
2015-04-24 21:09:27 +00:00
Scott Rowe
0f21039c92
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
2015-04-24 21:08:52 +00:00
Alan Viverette
8f74a5d811
Merge "Fix list selector background for Material spec"
2015-04-24 21:06:15 +00:00
Tony Mantler
7e98b54968
Merge "Add totalSize and availSize queries to StorageMeasurement"
2015-04-24 21:04:24 +00:00
Simranjit Singh Kohli
0208397726
Merge "[Fix confirmCredntials flow]"
2015-04-24 21:00:05 +00:00
Alan Viverette
78c2701e79
Fix list selector background for Material spec
...
Bug: 20557738
Change-Id: Id0aa7e5dc1d5ddce83f9ef0e128ae5a97e9a06fb
2015-04-24 13:59:02 -07:00
Simranjit Singh Kohli
82d01782b3
[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
2015-04-24 13:56:48 -07:00
Xiyuan Xia
b07ce17328
Use fillColor for battery bolt color.
...
Bug: 20178901
Change-Id: I19b1de98ece6681f5dd0a15a35f55fb88e4c2cfc
2015-04-24 13:53:33 -07:00
Wale Ogunwale
e31788e12b
Merge "Remove ZoomButtonsController view immediately when !visible"
2015-04-24 20:47:26 +00:00
Wale Ogunwale
5e641d6536
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
2015-04-24 13:46:11 -07:00
Alex Klyubin
f9c14b7d16
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.
2015-04-24 20:35:26 +00:00
Zhijun He
a58271419e
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
2015-04-24 13:35:07 -07:00
Alex Klyubin
b068ae143d
am e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
...
* commit 'e2b9bb45d20102f121660ed361bd4225852a55e0':
No runtime exceptions during normal use of AndroidKeyStore crypto.
2015-04-24 20:22:58 +00:00
Amith Yamasani
4bc704655a
Merge "Add ability to get and set idle state of apps"
2015-04-24 20:03:02 +00:00
Alex Klyubin
e2b9bb45d2
Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
2015-04-24 20:00:58 +00:00
Amith Yamasani
cf76872a62
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
2015-04-24 12:58:46 -07:00
Quddus Chong
9408959144
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.
2015-04-24 19:56:39 +00:00
Quddus Chong
9774e8ab08
Merge "docs: Updated What's New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
2015-04-24 19:48:04 +00:00
Jae Seo
de08be8f79
TIF: Use Preconditions.checkNotNull for null checking
...
Bug: 19941047
Change-Id: Ib2b5d86d21ecc48888f9343a0e8f16b08fef6925
2015-04-24 12:46:36 -07:00
Alan Viverette
d4925af839
Merge "Change direction of DPAD_LEFT and DPAD_RIGHT if LayoutDirection is RTL"
2015-04-24 19:40:58 +00:00
Jorn Jacobsson
599b64f937
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
2015-04-24 12:34:50 -07:00
Andy Hung
5a4ee7b62e
Merge "Fix API level in documentation to refer to MNC"
2015-04-24 19:22:22 +00:00
Andy Hung
35e576e792
Fix API level in documentation to refer to MNC
...
Change-Id: I2ab646fce1c3f58b11d88a47e733621d8f1fec79
2015-04-24 12:18:14 -07:00
Andy Hung
980d25ea4a
Merge "Increase AudioTrack and AudioRecord max sample rate to 192kHz"
2015-04-24 19:16:21 +00:00
Tor Norbye
1fd75d83c3
Merge "Add permission requirement annotation for KeyGuard"
2015-04-24 18:54:26 +00:00
Scott Rowe
eec5463cb9
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
2015-04-24 18:52:35 +00:00
Scott Rowe
5e95a91707
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
2015-04-24 18:43:03 +00:00
Santos Cordon
d974380564
Merge "Fix up DisconnectCause description."
2015-04-24 18:37:38 +00:00
Santos Cordon
c1ec931f00
Fix up DisconnectCause description.
...
Change-Id: Ib2b52b6f8bc8fe945df3684f4e1ed9e04f78b061
2015-04-24 11:37:07 -07:00
Alex Klyubin
9716b081a6
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.
2015-04-24 18:35:37 +00:00
Olawale Ogunwale
a298a96af7
am 3846d3a4: am 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
...
* commit '3846d3a4c5d79a9d7e86e43c64a5c21a29036de0':
[ActivityManager] Avoid orphan ContentProviderRecord.
2015-04-24 18:35:29 +00:00
Scott Rowe
17c0b25441
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
2015-04-24 18:30:07 +00:00
Leon Scroggins III
ff0bae7dbc
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
2015-04-24 18:22:00 +00:00
Leon Scroggins III
08a7c50cbe
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
2015-04-24 18:21:53 +00:00
Scott Rowe
1db13a9010
am 6a6bfe5e: am 6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
...
* commit '6a6bfe5e84b598f24d73138523d7f8d88729daed':
docs: Supported media protocols, codecs, formats for Android TV
2015-04-24 18:21:42 +00:00
Alex Klyubin
edf5454a14
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.
2015-04-24 18:21:22 +00:00
Olawale Ogunwale
3846d3a4c5
am 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
...
* commit '6d856bfba5b6ae488d49c4909510cd87000cd922':
[ActivityManager] Avoid orphan ContentProviderRecord.
2015-04-24 18:21:19 +00:00
Leon Scroggins III
fddbcd857f
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
2015-04-24 18:16:34 +00:00