OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Added SystemServiceRegistry to preloaded-classes"
Fyodor Kupolov [Fri, 24 Apr 2015 23:02:41 +0000 (23:02 +0000)]
Merge "Added SystemServiceRegistry to preloaded-classes"

9 years agoMerge "Notify IME visibility when showWindow is called."
Seigo Nonaka [Fri, 24 Apr 2015 22:46:12 +0000 (22:46 +0000)]
Merge "Notify IME visibility when showWindow is called."

9 years agoMerge "Image: fix build break"
Zhijun He [Fri, 24 Apr 2015 22:38:46 +0000 (22:38 +0000)]
Merge "Image: fix build break"

9 years agoMerge "parcel: Add efficient methods for writing and reading a parcelable."
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."

9 years agoam cc9c597d: am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi...
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"

9 years agoam 4cdc7e84: am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an...
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"

9 years agoImage: fix build break
Zhijun He [Fri, 24 Apr 2015 22:29:21 +0000 (15:29 -0700)]
Image: fix build break

Change-Id: I51e91a6c370626603f79371c16c8a10195ba63da

9 years agoam d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread acces...
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"

9 years agoam e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when...
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"

9 years agoam e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same...
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"

9 years agoam d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring...
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"

9 years agoam 6c1af7ea: am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using Native...
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.

9 years agoMerge "TIF: Use Preconditions.checkNotNull for null checking"
Jae Seo [Fri, 24 Apr 2015 22:03:35 +0000 (22:03 +0000)]
Merge "TIF: Use Preconditions.checkNotNull for null checking"

9 years agoMerge "UsbAlsaManager: Fix NPE when running in emulator"
Mike Lockwood [Fri, 24 Apr 2015 22:03:04 +0000 (22:03 +0000)]
Merge "UsbAlsaManager: Fix NPE when running in emulator"

9 years agoam 8652bce1: am c71f2648: Merge "frameworks/base: switch to using NativeConstants."
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.

9 years agoMerge "ImageWriter: fix and cleanup the closed Image Handling"
Zhijun He [Fri, 24 Apr 2015 21:59:21 +0000 (21:59 +0000)]
Merge "ImageWriter: fix and cleanup the closed Image Handling"

9 years agoUsbAlsaManager: Fix NPE when running in emulator
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

9 years agoMerge "Revert "[ActivityManager] Improve multi-thread access the same provider""
Wale Ogunwale [Fri, 24 Apr 2015 21:49:45 +0000 (21:49 +0000)]
Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""

9 years agoam c71f2648: Merge "frameworks/base: switch to using NativeConstants."
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.

9 years agoMerge "Revert "Clean-up state if we have an exception when acquiring provider""
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""

9 years agoMediaSync: rename onReturnAudioBuffer to onAudioBufferConsumed
Lajos Molnar [Fri, 24 Apr 2015 21:40:52 +0000 (14:40 -0700)]
MediaSync: rename onReturnAudioBuffer to onAudioBufferConsumed

Bug: 19666434
Change-Id: I117d4a1ab29e5c8e02879d2321316b669c8e43ae

9 years agoMerge "MediaSync: add OnErrorListener."
Wei Jia [Fri, 24 Apr 2015 21:46:22 +0000 (21:46 +0000)]
Merge "MediaSync: add OnErrorListener."

9 years agoRevert "[ActivityManager] Improve multi-thread access the same provider"
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

9 years agoRevert "Clean-up state if we have an exception when acquiring provider"
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

9 years agoMediaSync: add OnErrorListener.
Wei Jia [Fri, 24 Apr 2015 18:37:51 +0000 (11:37 -0700)]
MediaSync: add OnErrorListener.

Bug: 19666434
Change-Id: I34983d6101cc0f93ee74bdcec5d272808842a5c2

9 years agoMerge "frameworks/base: switch to using NativeConstants."
Kenny Root [Fri, 24 Apr 2015 21:26:06 +0000 (21:26 +0000)]
Merge "frameworks/base: switch to using NativeConstants."

9 years agoMerge "resolved conflicts for merge of f9c14b7d to master"
Alex Klyubin [Fri, 24 Apr 2015 21:25:31 +0000 (21:25 +0000)]
Merge "resolved conflicts for merge of f9c14b7d to master"

9 years agoresolved 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

9 years agoMerge "Never return a reference to sDefaults."
Jonathan Basseri [Fri, 24 Apr 2015 21:20:50 +0000 (21:20 +0000)]
Merge "Never return a reference to sDefaults."

9 years agoMerge "Use fillColor for battery bolt color."
Xiyuan Xia [Fri, 24 Apr 2015 21:13:53 +0000 (21:13 +0000)]
Merge "Use fillColor for battery bolt color."

9 years agoMerge "Add missing permission check in MountService"
Rubin Xu [Fri, 24 Apr 2015 21:14:37 +0000 (21:14 +0000)]
Merge "Add missing permission check in MountService"

9 years agoam 94089591: am 9774e8ab: Merge "docs: Updated What\'s New for GMS v7.3 to remove...
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.

9 years agoam eec5463c: am 5e95a917: am 17c0b254: am ccfedfcc: am 5827af11: am 02e4f2fb: Merge...
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

9 years agoMerge "Fix list selector background for Material spec"
Alan Viverette [Fri, 24 Apr 2015 21:06:12 +0000 (21:06 +0000)]
Merge "Fix list selector background for Material spec"

9 years agoMerge "Add totalSize and availSize queries to StorageMeasurement"
Tony Mantler [Fri, 24 Apr 2015 21:04:22 +0000 (21:04 +0000)]
Merge "Add totalSize and availSize queries to StorageMeasurement"

9 years agoMerge "[Fix confirmCredntials flow]"
Simranjit Singh Kohli [Fri, 24 Apr 2015 21:00:04 +0000 (21:00 +0000)]
Merge "[Fix confirmCredntials flow]"

9 years agoFix list selector background for Material spec
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

9 years ago[Fix confirmCredntials flow]
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

9 years agoUse fillColor for battery bolt color.
Xiyuan Xia [Fri, 24 Apr 2015 20:53:33 +0000 (13:53 -0700)]
Use fillColor for battery bolt color.

Bug: 20178901
Change-Id: I19b1de98ece6681f5dd0a15a35f55fb88e4c2cfc

9 years agoMerge "Remove ZoomButtonsController view immediately when !visible"
Wale Ogunwale [Fri, 24 Apr 2015 20:47:25 +0000 (20:47 +0000)]
Merge "Remove ZoomButtonsController view immediately when !visible"

9 years agoRemove 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

9 years agoam b068ae14: am e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKe...
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.

9 years agoImageWriter: fix and cleanup the closed Image Handling
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

9 years agoAdded SystemServiceRegistry to preloaded-classes
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

9 years agoam e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
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.

9 years agoNotify IME visibility when showWindow is called.
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

9 years agoMerge "Add ability to get and set idle state of apps"
Amith Yamasani [Fri, 24 Apr 2015 20:03:01 +0000 (20:03 +0000)]
Merge "Add ability to get and set idle state of apps"

9 years agoMerge "No runtime exceptions during normal use of AndroidKeyStore crypto."
Alex Klyubin [Fri, 24 Apr 2015 20:00:57 +0000 (20:00 +0000)]
Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."

9 years agoAdd ability to get and set idle state of apps
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

9 years agoam 9774e8ab: Merge "docs: Updated What\'s New for GMS v7.3 to remove Maps support...
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.

9 years agoMerge "docs: Updated What's New for GMS v7.3 to remove Maps support for Wear." into...
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

9 years agoTIF: Use Preconditions.checkNotNull for null checking
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

9 years agoMerge "Change direction of DPAD_LEFT and DPAD_RIGHT if LayoutDirection is RTL"
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"

9 years agoChange 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

9 years agoMerge "Fix API level in documentation to refer to MNC"
Andy Hung [Fri, 24 Apr 2015 19:22:21 +0000 (19:22 +0000)]
Merge "Fix API level in documentation to refer to MNC"

9 years agoFix 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

9 years agoMerge "Increase AudioTrack and AudioRecord max sample rate to 192kHz"
Andy Hung [Fri, 24 Apr 2015 19:16:20 +0000 (19:16 +0000)]
Merge "Increase AudioTrack and AudioRecord max sample rate to 192kHz"

9 years agoMerge "Add permission requirement annotation for KeyGuard"
Tor Norbye [Fri, 24 Apr 2015 18:54:24 +0000 (18:54 +0000)]
Merge "Add permission requirement annotation for KeyGuard"

9 years agoam 5e95a917: am 17c0b254: am ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Support...
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

9 years agoam 17c0b254: am ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Supported media...
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

9 years agoMerge "Fix up DisconnectCause description."
Santos Cordon [Fri, 24 Apr 2015 18:37:37 +0000 (18:37 +0000)]
Merge "Fix up DisconnectCause description."

9 years agoFix up DisconnectCause description.
Santos Cordon [Fri, 24 Apr 2015 18:26:01 +0000 (11:26 -0700)]
Fix up DisconnectCause description.

Change-Id: Ib2b52b6f8bc8fe945df3684f4e1ed9e04f78b061

9 years agoam edf5454a: am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher...
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.

9 years agoam 3846d3a4: am 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentP...
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.

9 years agoam ccfedfcc: am 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs...
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

9 years agoam fddbcd85: (-s ours) am 8be18bbf: am 4c1f70db: am b3523d7f: am 41c458c8: am 67326bc...
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

9 years agoam 38b84b6d: (-s ours) am 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad...
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

9 years agoam 6a6bfe5e: am 6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
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

9 years agoam 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when...
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.

9 years agoam 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
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.

9 years agoam 8be18bbf: am 4c1f70db: am b3523d7f: am 41c458c8: am 67326bcb: am ea2dcda7: am...
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

9 years agoam 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make...
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

9 years agoam 5827af11: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats...
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

9 years agoam 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
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.

9 years agoam cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
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.

9 years agoam 6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
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

9 years agoMerge "Implement RTL support in framework ViewPager, DatePicker"
Alan Viverette [Fri, 24 Apr 2015 18:06:48 +0000 (18:06 +0000)]
Merge "Implement RTL support in framework ViewPager, DatePicker"

9 years agoam 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android...
Scott Rowe [Fri, 24 Apr 2015 18:01:15 +0000 (18:01 +0000)]
am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

* commit '02e4f2fbe6e0511789d42d5942548158d2dd154f':
  docs: Supported media protocols, codecs, formats for Android TV

9 years agodocs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 20 Mar 2015 17:44:52 +0000 (10:44 -0700)]
docs: Supported media protocols, codecs, formats for Android TV

Change-Id: I8202ba148d35d73ee0940070090e0a29553f9202
(cherry picked from commit f769caa8c15f9983188597e2436b011d23ff2561)

9 years agoMerge "Remove line wrapping for publickey encoding."
dcashman [Fri, 24 Apr 2015 17:57:27 +0000 (17:57 +0000)]
Merge "Remove line wrapping for publickey encoding."

9 years agoam 4c1f70db: am b3523d7f: am 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f: (-s...
Leon Scroggins III [Fri, 24 Apr 2015 17:54:57 +0000 (17:54 +0000)]
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 '4c1f70db3dc37f818bdff09ec3e289b797acc397':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFr...
Leon Scroggins III [Fri, 24 Apr 2015 17:54:50 +0000 (17:54 +0000)]
am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '6db29a92452c2a837528d20d024dcacefd450c17':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoNo runtime exceptions during normal use of AndroidKeyStore crypto.
Alex Klyubin [Tue, 21 Apr 2015 22:17:24 +0000 (15:17 -0700)]
No runtime exceptions during normal use of AndroidKeyStore crypto.

This changes the implementation of AndroidKeyStore-backed Cipher and
Mac to avoid throwing runtime exceptions during normal use. Runtime
exceptions will now be thrown only due to truly exceptional and
unrecoverable errors (e.g., keystore unreachable, or crypto primitive
not initialized).

This also changes the implementation of Cipher to cache any errors
encountered in Cipher.update until Cipher.doFinal which then throws
them as checked exceptions.

Bug: 20525947
Change-Id: I3c4ad57fe70abfbb817a79402f722a0208660727

9 years agoam f237bce8: am 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework...
Mark Renouf [Fri, 24 Apr 2015 17:54:33 +0000 (17:54 +0000)]
am f237bce8: am 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)

* commit 'f237bce8c3bb4ac31a4c5eaa732de95d5b469f34':
  Fixes rejected dismiss gestures (framework version of ag/677161)

9 years agoRemove line wrapping for publickey encoding.
dcashman [Fri, 24 Apr 2015 17:52:56 +0000 (10:52 -0700)]
Remove line wrapping for publickey encoding.

This adds unnecessary whitespace in packages.xml and is contrary to the approach
taken by certs.  Remove it.

Change-Id: I217bb94af97c3b38dab1fd806ffe7b7600fa6fdd

9 years agoMerge "Reset AndroidKeyStore Mac and Cipher state when init fails."
Alex Klyubin [Fri, 24 Apr 2015 17:52:35 +0000 (17:52 +0000)]
Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."

9 years agoMerge "docs: Supported media protocols, codecs, formats for Android TV" into lmp...
Scott Rowe [Fri, 24 Apr 2015 17:49:13 +0000 (17:49 +0000)]
Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

9 years agoReset AndroidKeyStore Mac and Cipher state when init fails.
Alex Klyubin [Fri, 24 Apr 2015 17:47:17 +0000 (10:47 -0700)]
Reset AndroidKeyStore Mac and Cipher state when init fails.

For consistency, this also switches AndroidKeyStore's Mac init/reset
implementation to the same approach as used in Cipher.

Bug: 18088752
Change-Id: Id34caf7cfe04f2058e22d8632890f762927bb31c

9 years agoam b3523d7f: am 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a750111...
Leon Scroggins III [Fri, 24 Apr 2015 17:43:38 +0000 (17:43 +0000)]
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 'b3523d7f8f8274a04145ca34eab9821aafb52d7a':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel...
Leon Scroggins III [Fri, 24 Apr 2015 17:43:23 +0000 (17:43 +0000)]
am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit 'f828f43f97f4a018e2224e926b900713081a8c5b':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoMerge "[ActivityManager] Avoid orphan ContentProviderRecord."
Olawale Ogunwale [Fri, 24 Apr 2015 17:42:58 +0000 (17:42 +0000)]
Merge "[ActivityManager] Avoid orphan ContentProviderRecord."

9 years agoam 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework version of ag...
Mark Renouf [Fri, 24 Apr 2015 17:42:01 +0000 (17:42 +0000)]
am 99d49300: am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)

* commit '99d4930064e7d155ce92746028cbafd46b14c6f4':
  Fixes rejected dismiss gestures (framework version of ag/677161)

9 years agoMerge "Cleaned-up unused session argument."
Wale Ogunwale [Fri, 24 Apr 2015 17:34:54 +0000 (17:34 +0000)]
Merge "Cleaned-up unused session argument."

9 years agoam 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e96...
Leon Scroggins III [Fri, 24 Apr 2015 17:33:04 +0000 (17:33 +0000)]
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 '41c458c81125fb6e3fc9eb5304f0d3216a0a2d74':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color...
Leon Scroggins III [Fri, 24 Apr 2015 17:32:59 +0000 (17:32 +0000)]
am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '38cf068c04e1ce244529b95f6cc6d7d6a88fab24':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
Mark Renouf [Fri, 24 Apr 2015 17:31:31 +0000 (17:31 +0000)]
am 55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)

* commit '55555a3dab1f3b99a3299b90851624e9dc10f3cc':
  Fixes rejected dismiss gestures (framework version of ag/677161)

9 years agodocs: Updated What's New for GMS v7.3 to remove Maps support for Wear.
Quddus Chong [Fri, 24 Apr 2015 17:07:36 +0000 (10:07 -0700)]
docs: Updated What's New for GMS v7.3 to remove Maps support for Wear.

Change-Id: I8ebe6c77c4eac3ac660f148bf40ce9a1f710e5fb

9 years agoam 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitma...
Leon Scroggins III [Fri, 24 Apr 2015 17:15:55 +0000 (17:15 +0000)]
am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '67326bcba0f7287367dedba4caaf2a168a43f057':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO...
Leon Scroggins III [Fri, 24 Apr 2015 17:15:43 +0000 (17:15 +0000)]
am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '16ac8ad7fac73524b5296f955884bd2aec405ded':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoMerge "camera2: validate reprocess request's session"
Chien-Yu Chen [Fri, 24 Apr 2015 17:14:48 +0000 (17:14 +0000)]
Merge "camera2: validate reprocess request's session"