OSDN Git Service

android-x86/frameworks-base.git
9 years agoCEC: Prevent premature standby process completion
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

9 years agoMerge "Wait for first scan before partitioning is done."
Jeff Sharkey [Sun, 19 Apr 2015 21:37:47 +0000 (21:37 +0000)]
Merge "Wait for first scan before partitioning is done."

9 years agoWait for first scan before partitioning is done.
Jeff Sharkey [Sun, 19 Apr 2015 21:35:16 +0000 (14:35 -0700)]
Wait for first scan before partitioning is done.

This means newly created volumes are at least created for other
platform components to start poking with.

Bug: 19993667
Change-Id: I561a5d0e3659ff9146832aeb6a31ab78fd9da580

9 years agoMerge "Add OP_ADD_VOICEMAIL app op - framework"
Svet Ganov [Sun, 19 Apr 2015 20:05:07 +0000 (20:05 +0000)]
Merge "Add OP_ADD_VOICEMAIL app op - framework"

9 years agoAdd OP_ADD_VOICEMAIL app op - framework
Svet Ganov [Fri, 17 Apr 2015 16:07:22 +0000 (09:07 -0700)]
Add OP_ADD_VOICEMAIL app op - framework

Change-Id: Id21063b93958c9e372dcbaac8ff9f4fa8b5f0cb3

9 years agoImplement FloatingToolbar.hide()
Abodunrinwa Toki [Fri, 17 Apr 2015 19:31:34 +0000 (20:31 +0100)]
Implement FloatingToolbar.hide()

Bug: 20148125
Change-Id: I62e43df565801ada8230fc4a8d5d3f9e1fc842df

9 years agoMerge "Broadcast hidden volumes, notification polish."
Jeff Sharkey [Sun, 19 Apr 2015 06:16:59 +0000 (06:16 +0000)]
Merge "Broadcast hidden volumes, notification polish."

9 years agoBroadcast hidden volumes, notification polish.
Jeff Sharkey [Sun, 19 Apr 2015 04:38:05 +0000 (21:38 -0700)]
Broadcast hidden volumes, notification polish.

Send limited broadcast intent when certain volume state changes
occur; the only customer for now is ExternalStorageProvider.

Change notification flow to be less bumpy.  Pick USB icon based on
disk type, and avoid using "generic" disk labels.

Bug: 19993667
Change-Id: I263bc9e9aae2ae57eb4d1afe76da686aee5475fb

9 years agoam b84f4cfe: am fea08ccd: am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge...
Ryosuke Matsuuchi [Sun, 19 Apr 2015 05:50:47 +0000 (05:50 +0000)]
am b84f4cfe: am fea08ccd: am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit 'b84f4cfe5d09ea55900bd8ea3b68970a998a244f':
  doc: Add Korean version of DAC/distribute/ page.

9 years agoMerge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent.""
Jeff Sharkey [Sun, 19 Apr 2015 05:00:27 +0000 (05:00 +0000)]
Merge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent.""

9 years agoRevert "Add multi-sim support for getCarrierPackageNamesForIntent."
Jeff Sharkey [Sun, 19 Apr 2015 04:59:56 +0000 (04:59 +0000)]
Revert "Add multi-sim support for getCarrierPackageNamesForIntent."

This reverts commit 0ff9fd87d0a0d88bf46945629d0a30f6e7fb3f55.

Change-Id: I099c612ff1715c5c34c0ed9bc1bec460a1a5db01

9 years agoMerge "Enable the copy feature."
Jeff Sharkey [Sun, 19 Apr 2015 04:35:38 +0000 (04:35 +0000)]
Merge "Enable the copy feature."

9 years agoMerge "Add multi-sim support for getCarrierPackageNamesForIntent."
Junda Liu [Sun, 19 Apr 2015 04:30:11 +0000 (04:30 +0000)]
Merge "Add multi-sim support for getCarrierPackageNamesForIntent."

9 years agoMerge "Always send volume UUID with installd commands."
Jeff Sharkey [Sun, 19 Apr 2015 04:19:15 +0000 (04:19 +0000)]
Merge "Always send volume UUID with installd commands."

9 years agoAlways send volume UUID with installd commands.
Jeff Sharkey [Sun, 19 Apr 2015 03:23:13 +0000 (20:23 -0700)]
Always send volume UUID with installd commands.

Since packages can be moved to other volumes, all relevant commands
to installd now require an explicit volume UUID parameter.

Bug: 20275577
Change-Id: Ie84f5bc43c7aada5800b8d71692c7928b42b965e

9 years agoam fea08ccd: am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add...
Ryosuke Matsuuchi [Sun, 19 Apr 2015 01:30:42 +0000 (01:30 +0000)]
am fea08ccd: am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit 'fea08ccdffdf3d56276f84cf5b01165e6b2bb85f':
  doc: Add Korean version of DAC/distribute/ page.

9 years agoam 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version...
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:55:05 +0000 (00:55 +0000)]
am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '3d1a37e9ecffd89f61de27d924b0469a6a09ea8c':
  doc: Add Korean version of DAC/distribute/ page.

9 years agoam 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribu...
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:44:42 +0000 (00:44 +0000)]
am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '38d969c5c85f930cefef6f2fcad99d5aa8a0d5f7':
  doc: Add Korean version of DAC/distribute/ page.

9 years agoam 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page...
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:32:53 +0000 (00:32 +0000)]
am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '558907f702ab21d4166d5d7f7986cb18c4a993bd':
  doc: Add Korean version of DAC/distribute/ page.

9 years agoam 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:22:51 +0000 (00:22 +0000)]
am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '0d2f280310458d23618edf6550818f8f9cfa6b47':
  doc: Add Korean version of DAC/distribute/ page.

9 years agoam 93e73639: am 308cd160: am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge...
Dirk Dougherty [Sun, 19 Apr 2015 00:17:09 +0000 (00:17 +0000)]
am 93e73639: am 308cd160: am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '93e73639bf0e1cea63c0c0eee24f4be2aba5fb0f':
  Doc change: distribute landing page.

9 years agoMerge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:15:09 +0000 (00:15 +0000)]
Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

9 years agoam 308cd160: am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change...
Dirk Dougherty [Sun, 19 Apr 2015 00:05:38 +0000 (00:05 +0000)]
am 308cd160: am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '308cd16022c43b64e5621dbf6938c8ee5ad22aa9':
  Doc change: distribute landing page.

9 years agoam 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute...
Dirk Dougherty [Sat, 18 Apr 2015 23:54:58 +0000 (23:54 +0000)]
am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '488e5bbc2333adb1c84be90b797e1a8d36d070c3':
  Doc change: distribute landing page.

9 years agoam 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page...
Dirk Dougherty [Sat, 18 Apr 2015 23:43:54 +0000 (23:43 +0000)]
am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '1696552f127c82aed9036eb1fa6b44c826d57eec':
  Doc change: distribute landing page.

9 years agoam 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Sat, 18 Apr 2015 23:32:46 +0000 (23:32 +0000)]
am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '6e141199874f0c5603dee4fccc728412dad07d61':
  Doc change: distribute landing page.

9 years agoMerge "Wire up non-visible volumes, more states."
Jeff Sharkey [Sat, 18 Apr 2015 23:25:29 +0000 (23:25 +0000)]
Merge "Wire up non-visible volumes, more states."

9 years agoam ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Sat, 18 Apr 2015 23:22:48 +0000 (23:22 +0000)]
am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit 'ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
  Doc change: distribute landing page.

9 years agoWire up non-visible volumes, more states.
Jeff Sharkey [Sat, 18 Apr 2015 23:20:27 +0000 (16:20 -0700)]
Wire up non-visible volumes, more states.

Adds logic to ExternalStorageProvider to scan non-visible volumes,
such as USB OTG devices.  We use internal paths when surfacing these
volumes, which also optimizes around the FUSE daemon for public
devices.  Also dumps internal state when requested.

VolumeInfo now directly contains DiskInfo, which means it's
snapshotted when sending events, avoiding teardown races.  Switch
notifications to use this DiskInfo directly.

Finish wiring up new volume state, including helper methods to make
it readable/writable state clearer.  Handle disks and volumes with
spaces in their labels.

Bug: 19993667
Change-Id: I5c75e5658a6415976811477aebafee7694bde0f4

9 years agoMerge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Sat, 18 Apr 2015 23:11:40 +0000 (23:11 +0000)]
Merge "Doc change: distribute landing page." into lmp-docs

9 years agoDoc change: distribute landing page.
Dirk Dougherty [Mon, 10 Nov 2014 19:50:41 +0000 (11:50 -0800)]
Doc change: distribute landing page.

Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be

9 years agoFix calling package for app ops
Svet Ganov [Sat, 18 Apr 2015 19:03:44 +0000 (12:03 -0700)]
Fix calling package for app ops

Change-Id: Ie867262e74d0b09e16193cb575b1c1cf942c83cb

9 years agoMerge "Enable Text Selection Action Mode for seach boxes and action bar components."
Clara Bayarri [Sat, 18 Apr 2015 07:11:20 +0000 (07:11 +0000)]
Merge "Enable Text Selection Action Mode for seach boxes and action bar components."

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 18 Apr 2015 05:31:16 +0000 (05:31 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 18 Apr 2015 05:29:38 +0000 (22:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: I40b8fb51ad997a3c5a7a14eb51cc5025b6c52b34
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 18 Apr 2015 04:04:07 +0000 (04:04 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 18 Apr 2015 04:00:43 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0558ebee84c3b599dce7f50583753724e0e396b1
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 18 Apr 2015 03:42:17 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 18 Apr 2015 03:39:13 +0000 (20:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: I30e078fe1a9ea0fe645597d9dc93172f301322e9
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 18 Apr 2015 03:22:14 +0000 (20:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: If7a0cfd12e5ed935ad521bd48eb82dd6cad3084f
Auto-generated-cl: translation import

9 years agoMerge "MediaPlayer: initial timed id3 support"
Robert Shih [Sat, 18 Apr 2015 02:50:11 +0000 (02:50 +0000)]
Merge "MediaPlayer: initial timed id3 support"

9 years agoMediaPlayer: initial timed id3 support
Robert Shih [Fri, 10 Apr 2015 18:15:02 +0000 (11:15 -0700)]
MediaPlayer: initial timed id3 support

Change-Id: Ibf2ea8fa1b44f2953bda49cdc6da979c2d3f6be2

9 years agoMerge "Add isSystemUser API"
Amith Yamasani [Sat, 18 Apr 2015 02:01:17 +0000 (02:01 +0000)]
Merge "Add isSystemUser API"

9 years agoMerge "Consistent null-checking in MediaRouter."
P.Y. Laligand [Sat, 18 Apr 2015 01:56:42 +0000 (01:56 +0000)]
Merge "Consistent null-checking in MediaRouter."

9 years agoAdd isSystemUser API
Amith Yamasani [Sat, 18 Apr 2015 01:42:41 +0000 (18:42 -0700)]
Add isSystemUser API

Bug: 20348316
Bug: 19945747
Change-Id: Ibb81f0b2fccec621e26e4543bf9f26ffddfafb15

9 years agoMerge "Volumes know parent disks; unsupported disks."
Jeff Sharkey [Sat, 18 Apr 2015 01:12:24 +0000 (01:12 +0000)]
Merge "Volumes know parent disks; unsupported disks."

9 years agoVolumes know parent disks; unsupported disks.
Jeff Sharkey [Sat, 18 Apr 2015 00:35:07 +0000 (17:35 -0700)]
Volumes know parent disks; unsupported disks.

This is cleaner and more direct than the reverse of having the disk
publish child volume membership.  Rename state constants to match
public API.  Add state representing bad removal.  Make it clear that
volume flags are related to mounting.

Send new unsupported disk event when we finish scanning an entire
disk and have no meaningful volumes.

Splice disk labels into description when known.  Only adoptable
slots are directly visible to apps.

Bug: 19993667
Change-Id: I12fda95be0d82781f70c3d85c039749052dc936b

9 years agoRemove unnecessary WRITE_SMS permission - framework
Svetoslav [Thu, 16 Apr 2015 23:19:24 +0000 (16:19 -0700)]
Remove unnecessary WRITE_SMS permission - framework

Currently only one app can write to the SMS provider and it has to
be set as the default SMS app by the user in the UI. The default
SMS app is set by enabling the write SMS app op for it and keeping
this op off for other SMS apps. Hence, this permission does not
guard anything and can be taken out. The API change is fine as if
an app refers to the permission in the manifest as string it will
be ignored and if it was referred in Java the value is statically
compiled in the source.

Change-Id: I1128c3b034e6c7dda4baa051500ac1ef46a53575

9 years agoam 527b1d3a: (-s ours) am d1a72651: am b792f433: Merge "DO NOT MERGE: Make wifi scan...
Sean Wan [Sat, 18 Apr 2015 00:17:03 +0000 (00:17 +0000)]
am 527b1d3a: (-s ours) am d1a72651: am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev

* commit '527b1d3a06a6665006406a4239a58035642bc418':
  DO NOT MERGE: Make wifi scan interval when disconnected configurable.

9 years agoMerge "Teach telephony about location app ops"
Svetoslav [Sat, 18 Apr 2015 00:16:28 +0000 (00:16 +0000)]
Merge "Teach telephony about location app ops"

9 years agoMerge "Revert "Use real screen size to scale duration""
Doris Liu [Sat, 18 Apr 2015 00:14:37 +0000 (00:14 +0000)]
Merge "Revert "Use real screen size to scale duration""

9 years agoRevert "Use real screen size to scale duration"
Doris Liu [Sat, 18 Apr 2015 00:14:14 +0000 (00:14 +0000)]
Revert "Use real screen size to scale duration"

This reverts commit 5ed54c743c04e2bc349e12c31adb67cbc3094651.

Reverting to avoid build breakage.

Change-Id: Ib73056bb5a11e718cbc82db5917946bdf8db06dc

9 years agoam d1a72651: am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnec...
Sean Wan [Sat, 18 Apr 2015 00:04:38 +0000 (00:04 +0000)]
am d1a72651: am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev

* commit 'd1a72651ed723b8e89875cdd7e0429f1c35ca8c2':
  DO NOT MERGE: Make wifi scan interval when disconnected configurable.

9 years agoTeach telephony about location app ops
Svetoslav [Tue, 14 Apr 2015 21:32:25 +0000 (14:32 -0700)]
Teach telephony about location app ops

Change-Id: I2bd8f0cb90d161994045d403f5d0c129ea951c3f

9 years agoam b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configura...
Sean Wan [Fri, 17 Apr 2015 23:55:21 +0000 (23:55 +0000)]
am b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev

* commit 'b792f43301c61cce996dd5bac4589b4720a37bec':
  DO NOT MERGE: Make wifi scan interval when disconnected configurable.

9 years agoMerge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into...
Sean Wan [Fri, 17 Apr 2015 23:45:37 +0000 (23:45 +0000)]
Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev

9 years agoMerge "Use real screen size to scale duration"
Doris Liu [Fri, 17 Apr 2015 23:40:47 +0000 (23:40 +0000)]
Merge "Use real screen size to scale duration"

9 years agoMerge "SeekBar track and progress should both be 2dp"
Alan Viverette [Fri, 17 Apr 2015 23:40:41 +0000 (23:40 +0000)]
Merge "SeekBar track and progress should both be 2dp"

9 years agoUse real screen size to scale duration
Doris Liu [Fri, 17 Apr 2015 01:36:31 +0000 (18:36 -0700)]
Use real screen size to scale duration

Duration scale based on screen size was using the area of the screen
excluding system bars to compare with our reference device's screen
size. This caused the following issues:
1) On baseline device (i.e N5) a scaling factor that is not 1 will be
   applied to the duration.
2) Scaling on the same device will be different in landscape vs.
   portrait, as the system bars take different amounts of space in
   different orienations.

This CL fixes both of the above issues.

Bug: 20309042

Change-Id: I9d1d0a471d968bee1330b80f0f69a0066d6a1860

9 years agoDO NOT MERGE: Make wifi scan interval when disconnected configurable.
Sean Wan [Tue, 14 Apr 2015 21:26:40 +0000 (14:26 -0700)]
DO NOT MERGE: Make wifi scan interval when disconnected configurable.

Bug: 19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44

9 years agoSeekBar track and progress should both be 2dp
Alan Viverette [Fri, 17 Apr 2015 22:54:22 +0000 (15:54 -0700)]
SeekBar track and progress should both be 2dp

Bug: 20341931
Change-Id: Ica3b97d6fa1c96f2215afb0199e68dfe1976109b

9 years agoAdd multi-sim support for getCarrierPackageNamesForIntent.
Junda Liu [Fri, 17 Apr 2015 00:18:07 +0000 (17:18 -0700)]
Add multi-sim support for getCarrierPackageNamesForIntent.

Bug: b/20268073
Change-Id: Id100b7c4606287a1daa90092cd3c8a5a6519247d

9 years agoMerge "Fix build for real"
Svet Ganov [Fri, 17 Apr 2015 22:50:41 +0000 (22:50 +0000)]
Merge "Fix build for real"

9 years agoFix build for real
Svet Ganov [Fri, 17 Apr 2015 22:49:53 +0000 (15:49 -0700)]
Fix build for real

Change-Id: I5742226e9b873cd5a035f11be0e228188e215365

9 years agoMerge "Fix leaks due to GC circular references."
Jeff Brown [Fri, 17 Apr 2015 22:27:02 +0000 (22:27 +0000)]
Merge "Fix leaks due to GC circular references."

9 years agoFix leaks due to GC circular references.
Jeff Brown [Fri, 17 Apr 2015 22:22:27 +0000 (15:22 -0700)]
Fix leaks due to GC circular references.

The DisplayEventReceiver and SensorManager event queue both get
leaked when the Looper thread they are attached to dies because
the Java object holds a strong reference to its native peer and
meanwhile the native peer holds a strong reference to the Java
object through JNI.

Fixed the issue by indirecting through a weak reference as was
done for InputEventReceiver some time ago.

Bug: 12455729
Change-Id: I3d80a2a190192d1a2981bf5ae0cad30f0f7688a5

9 years agoMerge "Fix build"
Svet Ganov [Fri, 17 Apr 2015 22:17:41 +0000 (22:17 +0000)]
Merge "Fix build"

9 years agoMerge "Restore windowMinWidthMajor/Minor in alert dialog overlay theme"
Alan Viverette [Fri, 17 Apr 2015 22:16:07 +0000 (22:16 +0000)]
Merge "Restore windowMinWidthMajor/Minor in alert dialog overlay theme"

9 years agoFix build
Svet Ganov [Fri, 17 Apr 2015 22:12:48 +0000 (15:12 -0700)]
Fix build

Change-Id: If469dce767b492c3fcc1ad8cf7ab1041eb61096f

9 years agoRestore windowMinWidthMajor/Minor in alert dialog overlay theme
Alan Viverette [Fri, 17 Apr 2015 21:36:51 +0000 (14:36 -0700)]
Restore windowMinWidthMajor/Minor in alert dialog overlay theme

Bug: 20185630
Change-Id: Ic4a6b3d84a24c26846ea0fcc3ce32ca882e4dd95

9 years agoMerge "Add OP_READ_PHONE_STATE app op - framework"
Svet Ganov [Fri, 17 Apr 2015 21:34:02 +0000 (21:34 +0000)]
Merge "Add OP_READ_PHONE_STATE app op - framework"

9 years agoMerge "Set default values for VVM constants in CarrierConfigManager"
Yorke Lee [Fri, 17 Apr 2015 21:26:20 +0000 (21:26 +0000)]
Merge "Set default values for VVM constants in CarrierConfigManager"

9 years agoSet default values for VVM constants in CarrierConfigManager
Yorke Lee [Fri, 17 Apr 2015 20:55:56 +0000 (13:55 -0700)]
Set default values for VVM constants in CarrierConfigManager

* Also hide the constants, they don't need to be @SystemApi
* Make VVM_PORT_NUMBER an Int

Bug: 20272209
Change-Id: I0d47afd7916d40f77ba5bf8e95306b46b27c15b3

9 years agoRevert "A bunch more cleanups"
John Reck [Fri, 17 Apr 2015 20:45:40 +0000 (20:45 +0000)]
Revert "A bunch more cleanups"

This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.

Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d

9 years agoRevert "Move AssetAtlas off of SkBitmap*"
John Reck [Fri, 17 Apr 2015 20:45:19 +0000 (20:45 +0000)]
Revert "Move AssetAtlas off of SkBitmap*"

This reverts commit 87ffb63d90fb6dd2689fe72dcb24fda9a6156220.

Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa

9 years agoMerge "Revert "Remove Bitmap#getSkBitmap""
John Reck [Fri, 17 Apr 2015 20:46:21 +0000 (20:46 +0000)]
Merge "Revert "Remove Bitmap#getSkBitmap""

9 years agoRevert "Remove Bitmap#getSkBitmap"
John Reck [Fri, 17 Apr 2015 20:45:15 +0000 (20:45 +0000)]
Revert "Remove Bitmap#getSkBitmap"

This reverts commit 4bd981ec533a65e8dee053a0a709b484770b0a76.

Change-Id: I5c92cd955c6e70e197dc5cbc5dfeed8369a24a31

9 years agoAdd OP_READ_PHONE_STATE app op - framework
Svet Ganov [Thu, 16 Apr 2015 17:32:04 +0000 (10:32 -0700)]
Add OP_READ_PHONE_STATE app op - framework

The READ_PHONE_STATE permission protects PII information and
is in the Phone group. This change is adding the corrseponding
app op for gating access to the API guarded by READ_POHNE state
which will be used instead as an access control for legacy apps.

Change-Id: I2ff895a5a0e529f26ec0ad706266a30d829268ba

9 years agoMerge "Add non-blocking writes to AudioTrack"
Andy Hung [Fri, 17 Apr 2015 20:38:23 +0000 (20:38 +0000)]
Merge "Add non-blocking writes to AudioTrack"

9 years agoMerge "Speedup unlock when authenticating with fingerprint"
Jorim Jaggi [Fri, 17 Apr 2015 20:27:20 +0000 (20:27 +0000)]
Merge "Speedup unlock when authenticating with fingerprint"

9 years agoSpeedup unlock when authenticating with fingerprint
Jorim Jaggi [Thu, 16 Apr 2015 21:57:34 +0000 (14:57 -0700)]
Speedup unlock when authenticating with fingerprint

Change-Id: Ib76ff7a2a42cf6fc77848ef799c2a13b77cfebb2

9 years agoMerge changes from topics 'add-depth-capability', 'add-highresolution-level'
Eino-Ville Talvala [Fri, 17 Apr 2015 20:22:41 +0000 (20:22 +0000)]
Merge changes from topics 'add-depth-capability', 'add-highresolution-level'

* changes:
  Camera2: Add DEPTH_OUTPUT capability and DEPTH_DEPTH_IS_EXCLUSIVE field.
  Camera: Add HIGH_RESOLUTION hardware level.

9 years agoMerge "Add non-blocking reads to AudioRecord"
Andy Hung [Fri, 17 Apr 2015 19:51:34 +0000 (19:51 +0000)]
Merge "Add non-blocking reads to AudioRecord"

9 years agoam 34f0fd23: am a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_O...
Dmitriy Ivanov [Fri, 17 Apr 2015 19:47:51 +0000 (19:47 +0000)]
am 34f0fd23: am a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"

* commit '34f0fd239c456e4e064e4c14b768962292023800':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS

9 years agoMerge "Recover from dead GateKeeperService Binder"
Andres Morales [Fri, 17 Apr 2015 19:42:59 +0000 (19:42 +0000)]
Merge "Recover from dead GateKeeperService Binder"

9 years agoam a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
Dmitriy Ivanov [Fri, 17 Apr 2015 19:30:56 +0000 (19:30 +0000)]
am a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"

* commit 'a04b43020e1289e8b7b2501471740ace944f18d5':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS

9 years agoam b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
Dmitriy Ivanov [Fri, 17 Apr 2015 19:20:22 +0000 (19:20 +0000)]
am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"

* commit 'b0557acebc7a47f6d8a3653c376165160fc68105':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS

9 years agoMerge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
Dmitriy Ivanov [Fri, 17 Apr 2015 19:01:40 +0000 (19:01 +0000)]
Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"

9 years agoam a26c8371: am 5682a23e: am fef8bcf9: Merge "Explicitly use clang."
Dan Albert [Fri, 17 Apr 2015 18:50:41 +0000 (18:50 +0000)]
am a26c8371: am 5682a23e: am fef8bcf9: Merge "Explicitly use clang."

* commit 'a26c83718004c7640827d86b0f6a0fdf33017751':
  Explicitly use clang.

9 years agoRemove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Dmitriy Ivanov [Fri, 17 Apr 2015 18:50:29 +0000 (11:50 -0700)]
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS

  It is no longer needed.

Change-Id: I1b5a58528507df35cc0792a18be5583e3605cbe0

9 years agoam 5682a23e: am fef8bcf9: Merge "Explicitly use clang."
Dan Albert [Fri, 17 Apr 2015 18:42:44 +0000 (18:42 +0000)]
am 5682a23e: am fef8bcf9: Merge "Explicitly use clang."

* commit '5682a23ed41f50057887870f1aa9848b13a26190':
  Explicitly use clang.

9 years agoMerge "Move date picker arrows out of SimpleMonthView"
Alan Viverette [Fri, 17 Apr 2015 18:16:06 +0000 (18:16 +0000)]
Merge "Move date picker arrows out of SimpleMonthView"

9 years agoMerge "Drag n drop for stylus"
Mady Mellor [Fri, 17 Apr 2015 18:14:43 +0000 (18:14 +0000)]
Merge "Drag n drop for stylus"

9 years agoam fef8bcf9: Merge "Explicitly use clang."
Dan Albert [Fri, 17 Apr 2015 18:06:54 +0000 (18:06 +0000)]
am fef8bcf9: Merge "Explicitly use clang."

* commit 'fef8bcf92167fbfe06cfb4a18ddf12f272cae5f0':
  Explicitly use clang.

9 years agoMerge "Fixed a crash on android tv with the new heads-up manager"
Selim Cinek [Fri, 17 Apr 2015 18:03:28 +0000 (18:03 +0000)]
Merge "Fixed a crash on android tv with the new heads-up manager"

9 years agoFixed a crash on android tv with the new heads-up manager
Selim Cinek [Fri, 17 Apr 2015 17:39:11 +0000 (10:39 -0700)]
Fixed a crash on android tv with the new heads-up manager

Bug: 20282768
Change-Id: Ibb3dc879a2529c12f4d8ab6b031711363da93d37

9 years agoam fea8ddd4: am a9315dc1: am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge...
Rich Slogar [Fri, 17 Apr 2015 18:01:05 +0000 (18:01 +0000)]
am fea8ddd4: am a9315dc1: am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit 'fea8ddd4c7a79cc68a96901f86cfa527bbd44fd0':
  docs: studio remove gradle tasks dialog

9 years agoam 58befba6: am 124c4025: am 1252b4b8: am 61dd1dfd: am 684f3aa2: am efe861a4: Merge...
Rich Slogar [Fri, 17 Apr 2015 18:00:53 +0000 (18:00 +0000)]
am 58befba6: am 124c4025: am 1252b4b8: am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit '58befba6ac88b4216cac43f97a456d1119dcb972':
  docs: hierarchyviewer updates

9 years agoMerge "Clean up message dispatch in FingerprintService"
Jim Miller [Fri, 17 Apr 2015 17:57:09 +0000 (17:57 +0000)]
Merge "Clean up message dispatch in FingerprintService"

9 years agoMerge "Avoid deadlock when FSTRIM requested at boot."
Jeff Sharkey [Fri, 17 Apr 2015 17:55:03 +0000 (17:55 +0000)]
Merge "Avoid deadlock when FSTRIM requested at boot."