OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev
Tor Norbye [Mon, 4 May 2015 14:31:23 +0000 (14:31 +0000)]
am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev

* commit '335f043bdb20f3528f486ad91eb9e1fdf8f673ab':
  Add permission annotations on the AccountManager

9 years agoMerge "Add permission annotations on the AccountManager" into mnc-dev
Tor Norbye [Mon, 4 May 2015 14:19:18 +0000 (14:19 +0000)]
Merge "Add permission annotations on the AccountManager" into mnc-dev

9 years agoAdd permission annotations on the AccountManager
Tor Norbye [Thu, 23 Apr 2015 23:36:09 +0000 (16:36 -0700)]
Add permission annotations on the AccountManager

Also add some @NonNull and @Nullable annotations.

Change-Id: Ia42b1af21ed14691b2268ea8b0f55d1b8b5ea2a3

9 years agoam 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 4 May 2015 12:37:42 +0000 (12:37 +0000)]
am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE

* commit '3f2f2cbbd643661f2a15defa9774eb4c6b27b2a5':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 4 May 2015 12:11:09 +0000 (07:11 -0500)]
Import translations. DO NOT MERGE

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

9 years agoam 0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev
Lorenzo Colitti [Mon, 4 May 2015 01:10:28 +0000 (01:10 +0000)]
am 0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev

* commit '0fdf7eee6792140b453931c1100c1ff2d60b641e':
  Add a status bar icon for Ethernet.

9 years agoMerge "Add a status bar icon for Ethernet." into mnc-dev
Lorenzo Colitti [Mon, 4 May 2015 01:01:47 +0000 (01:01 +0000)]
Merge "Add a status bar icon for Ethernet." into mnc-dev

9 years agoam 303650c9: Add full backup criteria to android manifest
Matthew Williams [Sun, 3 May 2015 23:30:52 +0000 (23:30 +0000)]
am 303650c9: Add full backup criteria to android manifest

* commit '303650c9cdb7cec88e7ec20747b161d9fff10719':
  Add full backup criteria to android manifest

9 years agoAdd full backup criteria to android manifest
Matthew Williams [Sat, 18 Apr 2015 01:22:51 +0000 (18:22 -0700)]
Add full backup criteria to android manifest

BUG: 20010079
Api change: ApplicationInfo now has a fullBackupContent int
where -1 is (off) 0 is (on) and >0 indicates an xml
resource that should be parsed in order for a developer
to indicate exactly which files they want to include/exclude
from the backup set.
dd: https://docs.google.com/document/d/1dnNctwhWOI-_qtZ7I3iNRtrbShmERj2GFTzwV4xXtOk/edit#heading=h.wcfw1q2pbmae

Change-Id: I90273dc0aef5e9a3230c6b074a45e8f5409ed5ce

9 years agoam ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev
Svet Ganov [Sun, 3 May 2015 00:50:34 +0000 (00:50 +0000)]
am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev

* commit 'ca030f8ed5fd52f2821d159b9c16d0c514dc0688':
  Add read cell broadcast app op - framework

9 years agoam e9fc4cda: Merge "Add camera app op - framework" into mnc-dev
Svetoslav [Sun, 3 May 2015 00:50:30 +0000 (00:50 +0000)]
am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev

* commit 'e9fc4cda50664558028b79edd1f4b893cd4f52d3':
  Add camera app op - framework

9 years agoMerge "Add read cell broadcast app op - framework" into mnc-dev
Svet Ganov [Sun, 3 May 2015 00:44:13 +0000 (00:44 +0000)]
Merge "Add read cell broadcast app op - framework" into mnc-dev

9 years agoAdd read cell broadcast app op - framework
Svet Ganov [Sun, 3 May 2015 00:42:44 +0000 (17:42 -0700)]
Add read cell broadcast app op - framework

Change-Id: Icecc9d918db55493ada7a0faa6bfcc41d4114bbd

9 years agoMerge "Add camera app op - framework" into mnc-dev
Svetoslav [Sun, 3 May 2015 00:41:49 +0000 (00:41 +0000)]
Merge "Add camera app op - framework" into mnc-dev

9 years agoAdd camera app op - framework
Svetoslav [Fri, 1 May 2015 23:52:41 +0000 (16:52 -0700)]
Add camera app op - framework

Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0

9 years agoam 5ba44aff: Merge "BluetoothMidiService: Add support for sending SysEx messages...
Mike Lockwood [Sat, 2 May 2015 16:21:02 +0000 (16:21 +0000)]
am 5ba44aff: Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev

* commit '5ba44affe6747d2995030005bd99471d621d6e79':
  BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets

9 years agoMerge "BluetoothMidiService: Add support for sending SysEx messages that span multipl...
Mike Lockwood [Sat, 2 May 2015 16:09:45 +0000 (16:09 +0000)]
Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev

9 years agoam 9eb25fad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 2 May 2015 06:38:16 +0000 (06:38 +0000)]
am 9eb25fad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9eb25fad188e48fb3adafe1043f2014357cce898':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 2 May 2015 06:29:54 +0000 (06:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 2 May 2015 06:27:24 +0000 (23:27 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 2 May 2015 04:36:02 +0000 (04:36 +0000)]
am 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '6b27f7899f5bf76c2cb7b0d0ff85605b23ac80d0':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 2 May 2015 04:23:06 +0000 (04:23 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 2 May 2015 04:16:15 +0000 (23:16 -0500)]
Import translations. DO NOT MERGE

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

9 years agoam 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev
Lajos Molnar [Sat, 2 May 2015 02:27:09 +0000 (02:27 +0000)]
am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev

* commit '4971de2a2efe448171b87471ad65e986c3608c21':
  media: hook up MediaCodec.setSurface

9 years agoam 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into...
Chong Zhang [Sat, 2 May 2015 02:27:04 +0000 (02:27 +0000)]
am 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev

* commit '039cd7ffaa28376fe00396b92dc77716bfa6e42e':
  MediaRecorderTest: test recording from persistent surface

9 years agoam 03359161: MediaRecorder: implement persistent input surface APIs
Chong Zhang [Sat, 2 May 2015 02:27:00 +0000 (02:27 +0000)]
am 03359161: MediaRecorder: implement persistent input surface APIs

* commit '03359161734eb0bdfacb6ff91be8617b9c5eccab':
  MediaRecorder: implement persistent input surface APIs

9 years agoam 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev
Chong Zhang [Sat, 2 May 2015 02:26:55 +0000 (02:26 +0000)]
am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev

* commit '1d82220a0e6de28657c0882813571a70c383c22a':
  MediaCodec: implement persistent input surface APIs

9 years agoMerge "media: hook up MediaCodec.setSurface" into mnc-dev
Lajos Molnar [Sat, 2 May 2015 02:23:06 +0000 (02:23 +0000)]
Merge "media: hook up MediaCodec.setSurface" into mnc-dev

9 years agoMerge "MediaRecorderTest: test recording from persistent surface" into mnc-dev
Chong Zhang [Sat, 2 May 2015 02:20:46 +0000 (02:20 +0000)]
Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev

9 years agoMediaRecorder: implement persistent input surface APIs
Chong Zhang [Fri, 1 May 2015 19:50:30 +0000 (12:50 -0700)]
MediaRecorder: implement persistent input surface APIs

Bug: 19127604
Bug: 19489395

Change-Id: Ic8e151b97ea6b85fc65f724d3e68e1cb6b500866

9 years agoMerge "MediaCodec: implement persistent input surface APIs" into mnc-dev
Chong Zhang [Sat, 2 May 2015 02:14:36 +0000 (02:14 +0000)]
Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev

9 years agoAdd a status bar icon for Ethernet.
Lorenzo Colitti [Mon, 27 Apr 2015 11:32:01 +0000 (20:32 +0900)]
Add a status bar icon for Ethernet.

Bug: 20613953
Change-Id: I52970b4f5fb6429876d1a2eb195a834c9e020021

9 years agoam 13428b50: am f626c679: am a7f07fc3: Merge "Add configuration to allow animations...
Bryce Lee [Sat, 2 May 2015 01:37:17 +0000 (01:37 +0000)]
am 13428b50: am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev

* commit '13428b5079e5b0c53efb2e5188f542fab1a7f91c':
  Add configuration to allow animations during low power mode.

9 years agoam c2180dd5: am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge...
Rich Slogar [Sat, 2 May 2015 01:37:13 +0000 (01:37 +0000)]
am c2180dd5: am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs

* commit 'c2180dd5168af07ef18bafb629c25ea2f3b42138':

9 years agoMediaRecorderTest: test recording from persistent surface
Chong Zhang [Fri, 1 May 2015 22:02:49 +0000 (15:02 -0700)]
MediaRecorderTest: test recording from persistent surface

Bug: 19127604
Bug: 19489395

Change-Id: I17984e0febaf0541a0ce650a07e0c485ffc41c08

9 years agoam d8417f12: am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download...
Rich Slogar [Sat, 2 May 2015 01:37:07 +0000 (01:37 +0000)]
am d8417f12: am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs

* commit 'd8417f1216ec4285b6c9c0ebdd6a441d9f4c94fc':
  docs: studio 1.2 download link fix

9 years agoMediaCodec: implement persistent input surface APIs
Chong Zhang [Tue, 28 Apr 2015 20:38:48 +0000 (13:38 -0700)]
MediaCodec: implement persistent input surface APIs

Bug: 19127604
Bug: 19489395

Change-Id: If0d723c9ecd6fe81d9df210bd2fd026b8603ea4a

9 years agoam f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low...
Bryce Lee [Sat, 2 May 2015 01:22:24 +0000 (01:22 +0000)]
am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev

* commit 'f626c679fdd7e44c6cf0eb2d2f6be786636a90bc':
  Add configuration to allow animations during low power mode.

9 years agoam 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio...
Rich Slogar [Sat, 2 May 2015 01:22:14 +0000 (01:22 +0000)]
am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs

* commit '31e493277ada5dc72e6b0bf501fa649307bf6814':

9 years agoam 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix...
Rich Slogar [Sat, 2 May 2015 01:22:07 +0000 (01:22 +0000)]
am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs

* commit '906c4f2719f73263a2c004e110172f41f5fbd67a':
  docs: studio 1.2 download link fix

9 years agoam 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev
Raph Levien [Sat, 2 May 2015 00:46:39 +0000 (00:46 +0000)]
am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev

* commit '5c268763049dd56a0e18c1652a671a1ad20978dd':
  Expose StaticLayout.Builder publicly

9 years agoam 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev
Raph Levien [Sat, 2 May 2015 00:46:34 +0000 (00:46 +0000)]
am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev

* commit '4bf4e4c80181cd7c4e1a9d26c443dd1d529455e7':
  Make Paint a required field of StaticLayout Builder

9 years agoam b6bec1a4: Remove unused methods/variables/fields from Editor.java.
Yohei Yukawa [Sat, 2 May 2015 00:46:30 +0000 (00:46 +0000)]
am b6bec1a4: Remove unused methods/variables/fields from Editor.java.

* commit 'b6bec1a403fd3efc59acb2c2206aaf6b6840c2f1':
  Remove unused methods/variables/fields from Editor.java.

9 years agoMerge "Expose StaticLayout.Builder publicly" into mnc-dev
Raph Levien [Sat, 2 May 2015 00:42:13 +0000 (00:42 +0000)]
Merge "Expose StaticLayout.Builder publicly" into mnc-dev

9 years agoMerge "Make Paint a required field of StaticLayout Builder" into mnc-dev
Raph Levien [Sat, 2 May 2015 00:41:50 +0000 (00:41 +0000)]
Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev

9 years agomedia: hook up MediaCodec.setSurface
Lajos Molnar [Fri, 1 May 2015 22:59:35 +0000 (15:59 -0700)]
media: hook up MediaCodec.setSurface

Bug: 11990461
Change-Id: Id2dc952594c21c6be68e4ffd039c7f74006a2374

9 years agoRemove unused methods/variables/fields from Editor.java.
Yohei Yukawa [Fri, 1 May 2015 23:18:25 +0000 (16:18 -0700)]
Remove unused methods/variables/fields from Editor.java.

This CL does nothing but remove unused code.

Change-Id: Ibe7c7aa1b9bdfd4117e27cb198082e307f4d68a4

9 years agoam 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev
Svet Ganov [Fri, 1 May 2015 23:21:47 +0000 (23:21 +0000)]
am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev

* commit '574f53793d6441ebf55ca8811588ad37d9451a9a':
  Add body sensors app op - framework base

9 years agoBluetoothMidiService: Add support for sending SysEx messages that span multiple Bluet...
Mike Lockwood [Fri, 1 May 2015 21:36:44 +0000 (14:36 -0700)]
BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets

Change-Id: Id56f7c82ec97b6a46258111bbfd46ab1dc14dfe9

9 years agoMerge "Add body sensors app op - framework base" into mnc-dev
Svet Ganov [Fri, 1 May 2015 23:09:51 +0000 (23:09 +0000)]
Merge "Add body sensors app op - framework base" into mnc-dev

9 years agoExpose StaticLayout.Builder publicly
Raph Levien [Thu, 30 Apr 2015 23:29:59 +0000 (16:29 -0700)]
Expose StaticLayout.Builder publicly

Expose the new Builder pattern for creating StaticLayout. This allows
access to a number of features that have been available to TextView
through a hidden constructor. Some of these features have existed
for a while (mostly maxLines), while others are new (breakStrategy,
indents).

The builder is cleaner and has a better upgrade path than the old
pattern of lots of constructors with varying numbers of arguments.

Bug: 20190561
Change-Id: Ia3cd124825ab0cb469d22d1fc576ad26454545b8

9 years agoam 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty...
Chris Craik [Fri, 1 May 2015 21:48:44 +0000 (21:48 +0000)]
am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev

* commit '106f88c890bd128ef89aa4f0dee591c2ad38fa6b':
  Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""

9 years agoam 4eb03f8f: Merge "Remove obsolete code for App Links IntentFilterVerifier" into...
Fabrice Di Meglio [Fri, 1 May 2015 21:37:12 +0000 (21:37 +0000)]
am 4eb03f8f: Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev

* commit '4eb03f8fd28e757bd636a899c8679731c7eed0a9':
  Remove obsolete code for App Links IntentFilterVerifier

9 years agoMerge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into...
Chris Craik [Fri, 1 May 2015 21:36:05 +0000 (21:36 +0000)]
Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev

9 years agoRevert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
Chris Craik [Fri, 1 May 2015 21:22:47 +0000 (14:22 -0700)]
Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""

Fixes breakage from HwAccelerationTest

This reverts commit b2847afde24aac22c8fb804cdce0c24b8a7c40c4.

Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1

9 years agoMerge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev
Fabrice Di Meglio [Fri, 1 May 2015 21:25:25 +0000 (21:25 +0000)]
Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev

9 years agoRemove obsolete code for App Links IntentFilterVerifier
Fabrice Di Meglio [Fri, 1 May 2015 21:21:41 +0000 (14:21 -0700)]
Remove obsolete code for App Links IntentFilterVerifier

- the intent filter verification is now done by the StatementService

See bug #20759587

Change-Id: Icee668819feffc282b3986873c9d13abbe03e92b

9 years agoam 5c705c59: Merge "Fix build." into mnc-dev
Chris Craik [Fri, 1 May 2015 21:12:27 +0000 (21:12 +0000)]
am 5c705c59: Merge "Fix build." into mnc-dev

* commit '5c705c595d6adbb4b6e8ad5dee29205246cd5cc4':
  Fix build.

9 years agoMerge "Fix build." into mnc-dev
Chris Craik [Fri, 1 May 2015 21:01:13 +0000 (21:01 +0000)]
Merge "Fix build." into mnc-dev

9 years agoFix build.
Chris Craik [Fri, 1 May 2015 21:01:01 +0000 (21:01 +0000)]
Fix build.

Revert "Merge getDisplayList and updateDisplayListIfDirty"

This reverts commit f85d064b536d9b2028a83e21d98eac9b40b74e95.

Change-Id: I8b1566aba67c385d72759ea2aea16edcd8477813

9 years agoAdd body sensors app op - framework base
Svet Ganov [Thu, 30 Apr 2015 17:38:13 +0000 (10:38 -0700)]
Add body sensors app op - framework base

Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9

9 years agoam f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
Chris Craik [Fri, 1 May 2015 20:47:19 +0000 (20:47 +0000)]
am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev

* commit 'f4ff8f701f8127ad9e187a30e9407375695a4b62':
  Merge getDisplayList and updateDisplayListIfDirty

9 years agoam 04c0f415: Merge "Update alpha documentation" into mnc-dev
Chris Craik [Fri, 1 May 2015 20:47:15 +0000 (20:47 +0000)]
am 04c0f415: Merge "Update alpha documentation" into mnc-dev

* commit '04c0f415b566932a98a65076a403a2e3b589a86c':
  Update alpha documentation

9 years agoam 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev
Jorim Jaggi [Fri, 1 May 2015 20:47:10 +0000 (20:47 +0000)]
am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev

* commit '0629a5d524a9444e28bc1b3ad8215276f3a94f50':
  Rename supportsAssistGesture to supportsAssist

9 years agoMerge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
Chris Craik [Fri, 1 May 2015 20:36:03 +0000 (20:36 +0000)]
Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev

9 years agoMerge "Update alpha documentation" into mnc-dev
Chris Craik [Fri, 1 May 2015 20:36:02 +0000 (20:36 +0000)]
Merge "Update alpha documentation" into mnc-dev

9 years agoMerge "Rename supportsAssistGesture to supportsAssist" into mnc-dev
Jorim Jaggi [Fri, 1 May 2015 20:34:21 +0000 (20:34 +0000)]
Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev

9 years agoRename supportsAssistGesture to supportsAssist
Jorim Jaggi [Thu, 30 Apr 2015 18:49:29 +0000 (11:49 -0700)]
Rename supportsAssistGesture to supportsAssist

Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448

9 years agoam 9a4cdf5c: Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev
Mathieu Chartier [Fri, 1 May 2015 19:02:08 +0000 (19:02 +0000)]
am 9a4cdf5c: Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev

* commit '9a4cdf5caaccdc02d3439addfa19a32de18d2405':
  Look at map extensions before /dev/ + ashmem.

9 years agoam b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev
Chris Wren [Fri, 1 May 2015 19:02:04 +0000 (19:02 +0000)]
am b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev

* commit 'b1ad8e9ea03380f14aae9970e0c112573831c5f9':
  remove unused edge border dimension.
  log clear all button

9 years agoMerge "Look at map extensions before /dev/ + ashmem." into mnc-dev
Mathieu Chartier [Fri, 1 May 2015 18:52:19 +0000 (18:52 +0000)]
Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev

9 years agoLook at map extensions before /dev/ + ashmem.
Mathieu Chartier [Fri, 1 May 2015 18:30:22 +0000 (11:30 -0700)]
Look at map extensions before /dev/ + ashmem.

Prevents stuff like:
dalvik-classes.dex appearing as GC overhead.

Bug: 20752953
Change-Id: Iab0935e882a5d938651ec2581845d8242aaf98af

9 years agoMerge changes from topic 'tron' into mnc-dev
Chris Wren [Fri, 1 May 2015 18:46:40 +0000 (18:46 +0000)]
Merge changes from topic 'tron' into mnc-dev

* changes:
  remove unused edge border dimension.
  log clear all button

9 years agoam da0d6a6b: Merge "Correctly handle intercepted touch events in FastScroller" into...
Alan Viverette [Fri, 1 May 2015 18:36:58 +0000 (18:36 +0000)]
am da0d6a6b: Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev

* commit 'da0d6a6b8ac0a3feaf276d462ed5121df37da2aa':
  Correctly handle intercepted touch events in FastScroller

9 years agoam 0f2be13d: camera: Update Camera2 API for arbitration.
Ruben Brunk [Fri, 1 May 2015 18:36:54 +0000 (18:36 +0000)]
am 0f2be13d: camera: Update Camera2 API for arbitration.

* commit '0f2be13dc691ff087d1705b7ea632654cc06c383':
  camera: Update Camera2 API for arbitration.

9 years agoam 83bb765b: Merge "Add IntentFilter auto verification - part 7" into mnc-dev
Fabrice Di Meglio [Fri, 1 May 2015 18:31:22 +0000 (18:31 +0000)]
am 83bb765b: Merge "Add IntentFilter auto verification - part 7" into mnc-dev

* commit '83bb765b046a3c6d90abbd65545d4532f647ae14':
  Add IntentFilter auto verification - part 7

9 years agoam f3280041: Merge "Add Properties to Call.Details." into mnc-dev
Andrew Lee [Fri, 1 May 2015 18:31:17 +0000 (18:31 +0000)]
am f3280041: Merge "Add Properties to Call.Details." into mnc-dev

* commit 'f3280041f0a9b462fd90cc043ea790a5db59daf4':
  Add Properties to Call.Details.

9 years agoam 097d5f10: Merge "Suggestions popup must be dismissed before device rotation."...
Yohei Yukawa [Fri, 1 May 2015 18:31:10 +0000 (18:31 +0000)]
am 097d5f10: Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev

* commit '097d5f107391bb1414124b4de7a510bb6ff47de3':
  Suggestions popup must be dismissed before device rotation.

9 years agoam 92d42057: Merge "Exclude bound app widgets from idle app list" into mnc-dev
Amith Yamasani [Fri, 1 May 2015 18:31:03 +0000 (18:31 +0000)]
am 92d42057: Merge "Exclude bound app widgets from idle app list" into mnc-dev

* commit '92d420579b894de01db347066fbf8f1705e78364':
  Exclude bound app widgets from idle app list

9 years agoMerge "Correctly handle intercepted touch events in FastScroller" into mnc-dev
Alan Viverette [Fri, 1 May 2015 18:30:25 +0000 (18:30 +0000)]
Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev

9 years agocamera: Update Camera2 API for arbitration.
Ruben Brunk [Fri, 17 Apr 2015 21:23:40 +0000 (14:23 -0700)]
camera: Update Camera2 API for arbitration.

- Update documentation for new arbitration behavior.
- Ensure an appropriate error is thrown when calling
  open while an existing, higher-priority user holds
  the camera device.

Bug: 19186859
Change-Id: I486193c14b7fd5dc6ce30c1b7471669c009d64b3

9 years agoMerge "Add IntentFilter auto verification - part 7" into mnc-dev
Fabrice Di Meglio [Fri, 1 May 2015 18:27:29 +0000 (18:27 +0000)]
Merge "Add IntentFilter auto verification - part 7" into mnc-dev

9 years agoMerge "Add Properties to Call.Details." into mnc-dev
Andrew Lee [Fri, 1 May 2015 18:27:20 +0000 (18:27 +0000)]
Merge "Add Properties to Call.Details." into mnc-dev

9 years agoMerge "Suggestions popup must be dismissed before device rotation." into mnc-dev
Yohei Yukawa [Fri, 1 May 2015 18:27:04 +0000 (18:27 +0000)]
Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev

9 years agoAdd IntentFilter auto verification - part 7
Fabrice Di Meglio [Thu, 30 Apr 2015 02:42:41 +0000 (19:42 -0700)]
Add IntentFilter auto verification - part 7

- update packages priming so that it effectively save its data
- use ArraySet instead of ArrayList for list of domains (a set
is preferable as we dont want duplicates)

See bug #19628909

Change-Id: I52085f4bc28dcbc7fbc02ba0898abcd4ae9cf1e2

9 years agoMerge "Exclude bound app widgets from idle app list" into mnc-dev
Amith Yamasani [Fri, 1 May 2015 18:21:39 +0000 (18:21 +0000)]
Merge "Exclude bound app widgets from idle app list" into mnc-dev

9 years agoExclude bound app widgets from idle app list
Amith Yamasani [Fri, 1 May 2015 00:32:25 +0000 (17:32 -0700)]
Exclude bound app widgets from idle app list

Track package names of bound app widgets and use the list when
querying for idle apps.

Bug: 20066058
Change-Id: If8039397a061ef04bb13aa38d57cd7f0221f5fc7

9 years agoam 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev
Dan Sandler [Fri, 1 May 2015 18:08:06 +0000 (18:08 +0000)]
am 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev

* commit '9fc943d1a69f2ab0f6d8285b09aef7e344a1fd1a':
  Icon: a clean, parcelable place for images.

9 years agoam a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev
Benjamin Franz [Fri, 1 May 2015 18:08:01 +0000 (18:08 +0000)]
am a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev

* commit 'a7cba44a22ffdaccf5198bb83b73a31c78091978':
  Improve Accessibility behaviour in recents

9 years agoam 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is...
Doris Liu [Fri, 1 May 2015 18:07:56 +0000 (18:07 +0000)]
am 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev

* commit '27cfed7ba56b485eb656bd7fbe6506d9d6c73e05':
  Make sure transform matrix is applied when hardware layer is re-created

9 years agoMerge "Icon: a clean, parcelable place for images." into mnc-dev
Dan Sandler [Fri, 1 May 2015 17:57:13 +0000 (17:57 +0000)]
Merge "Icon: a clean, parcelable place for images." into mnc-dev

9 years agoMerge "Improve Accessibility behaviour in recents" into mnc-dev
Benjamin Franz [Fri, 1 May 2015 17:56:16 +0000 (17:56 +0000)]
Merge "Improve Accessibility behaviour in recents" into mnc-dev

9 years agoMerge "Make sure transform matrix is applied when hardware layer is re-created" into...
Doris Liu [Fri, 1 May 2015 17:54:43 +0000 (17:54 +0000)]
Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev

9 years agoIcon: a clean, parcelable place for images.
Dan Sandler [Wed, 4 Mar 2015 18:08:49 +0000 (13:08 -0500)]
Icon: a clean, parcelable place for images.

Binder APIs which wish to consume Bitmaps *and* drawable
resources can now do so by using Icon, a kind of union type
that accommodates each of these. Icon also accepts byte
arrays holding compressed Bitmaps (PNG, JPEG, etc), which
saves clients the additional memory cost of decoding and
sending full uncompressed bitmaps through Binder interfaces.
Receiving clients can call loadDrawable{,Async} and then
getDrawable to start immediately using the image in an
ImageView or other Drawable-hosting container.

Bug: 19609468
Change-Id: Ic1343711c2ac0b15876b46f0b6008b0108a49470

9 years agoCorrectly handle intercepted touch events in FastScroller
Alan Viverette [Fri, 1 May 2015 17:10:15 +0000 (10:10 -0700)]
Correctly handle intercepted touch events in FastScroller

Previously we'd return true from onIntercept and assume the DOWN event
was handled, then onTouch would return false and the host view would
receive the DOWN event. Now we consume the event in onTouch.

Bug: 19080751
Change-Id: I1bd35b4c25a0760f4248ade443d09b8ca4b71e7c

9 years agoam 087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev
Roozbeh Pournader [Fri, 1 May 2015 16:58:49 +0000 (16:58 +0000)]
am 087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev

* commit '087497d256d155d432edd976d9e16671ec665462':
  Rename Noto Han fonts to their latest names.

9 years agoam 13a98b6c: Support for bearer_bitmask.
Amit Mahajan [Fri, 1 May 2015 16:58:45 +0000 (16:58 +0000)]
am 13a98b6c: Support for bearer_bitmask.

* commit '13a98b6c6ed28bfa0cb373e49c183167699e30f0':
  Support for bearer_bitmask.

9 years agoMerge "Rename Noto Han fonts to their latest names." into mnc-dev
Roozbeh Pournader [Fri, 1 May 2015 16:50:51 +0000 (16:50 +0000)]
Merge "Rename Noto Han fonts to their latest names." into mnc-dev

9 years agoSupport for bearer_bitmask.
Amit Mahajan [Thu, 26 Feb 2015 18:46:17 +0000 (10:46 -0800)]
Support for bearer_bitmask.

Change-Id: I7cae3d229445607c66b6472124264588f7571097

9 years agoam a320505f: Merge "Move both app code and data together." into mnc-dev
Jeff Sharkey [Fri, 1 May 2015 16:35:49 +0000 (16:35 +0000)]
am a320505f: Merge "Move both app code and data together." into mnc-dev

* commit 'a320505f3a39e21f29065f0f2a01089363825318':
  Move both app code and data together.