OSDN Git Service
John Reck [Mon, 4 May 2015 17:42:26 +0000 (17:42 +0000)]
am
e678b41c: Merge "Fix setName use-after-free" into mnc-dev
* commit '
e678b41cdb56847c094260607ea39aea4abb808e':
Fix setName use-after-free
John Reck [Mon, 4 May 2015 17:35:32 +0000 (17:35 +0000)]
Merge "Fix setName use-after-free" into mnc-dev
John Reck [Mon, 4 May 2015 16:44:28 +0000 (09:44 -0700)]
Fix setName use-after-free
Bug:
20764439
Change-Id: I7a0f85bb82629b1302db02015fa493dc09eb31f7
Jose Lima [Mon, 4 May 2015 16:37:25 +0000 (16:37 +0000)]
am
5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev
* commit '
5551aca2b8ec9fe7ab5ffda8dad82ee104556962':
Move ContentInfoExtender from Notification.java to a support library
Steve McKay [Mon, 4 May 2015 16:31:08 +0000 (16:31 +0000)]
am
5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev
* commit '
5d2c1d54b953ac0e4243210237fec92e3105844e':
Ensure sort menu is shown as needed.
Jose Lima [Mon, 4 May 2015 16:29:27 +0000 (16:29 +0000)]
Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev
Steve McKay [Mon, 4 May 2015 16:22:42 +0000 (16:22 +0000)]
Merge "Ensure sort menu is shown as needed." into mnc-dev
Steve McKay [Thu, 30 Apr 2015 23:12:59 +0000 (16:12 -0700)]
Ensure sort menu is shown as needed.
This also hoists common code for options menu setup into BaseActivity.
Change-Id: Ie87b8188a6c142b2312c92dc0d0bd550f0b1e59f
Geoff Mendal [Mon, 4 May 2015 14:53:50 +0000 (14:53 +0000)]
am
cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
cf1f2ea5a7945dc4982b1e41197af94ad64e8f37':
Import translations. DO NOT MERGE
Andrew Flynn [Mon, 4 May 2015 14:53:46 +0000 (14:53 +0000)]
am
ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev
* commit '
ae499d19eb70a46f12d6d750c608b893951a118b':
SystemUI Carrier Network Change unit tests
Geoff Mendal [Mon, 4 May 2015 14:44:11 +0000 (14:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 4 May 2015 14:43:39 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6371c9d043b9d5436804c4d755ecc6a645ff7119
Auto-generated-cl: translation import
Andrew Flynn [Mon, 4 May 2015 14:43:19 +0000 (14:43 +0000)]
Merge "SystemUI Carrier Network Change unit tests" into mnc-dev
John Reck [Mon, 4 May 2015 14:40:45 +0000 (14:40 +0000)]
am
05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev
* commit '
05dc201ff64f6324c2726a8841af7021e7071b97':
Remove Bitmap#getSkBitmap
John Reck [Mon, 4 May 2015 14:40:41 +0000 (14:40 +0000)]
am
1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
* commit '
1641c0cb0b6baf313c82846fe4f64007078c604f':
Move AssetAtlas off of SkBitmap*
John Reck [Mon, 4 May 2015 14:34:41 +0000 (14:34 +0000)]
Merge "Remove Bitmap#getSkBitmap" into mnc-dev
John Reck [Mon, 4 May 2015 14:34:38 +0000 (14:34 +0000)]
Merge "Move AssetAtlas off of SkBitmap*" 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
Andrew Flynn [Fri, 1 May 2015 15:50:07 +0000 (11:50 -0400)]
SystemUI Carrier Network Change unit tests
- Includes unit tests for verifying mobile data indicators.
- Found one bug where dark mode icon wasn't showing properly when
different from light mode icon.
- Comment out failing test
NetworkControllerSignalTest#testSetCurrentSubscriptions
Bug:
20288155
Change-Id: Ib3c9ba224c4187cab35d6bfa68f6bd4c489cf98e
Tor Norbye [Mon, 4 May 2015 14:19:18 +0000 (14:19 +0000)]
Merge "Add permission annotations on the AccountManager" into mnc-dev
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
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
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
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.
Lorenzo Colitti [Mon, 4 May 2015 01:01:47 +0000 (01:01 +0000)]
Merge "Add a status bar icon for Ethernet." into mnc-dev
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
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
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
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
Svet Ganov [Sun, 3 May 2015 00:44:13 +0000 (00:44 +0000)]
Merge "Add read cell broadcast app op - framework" into mnc-dev
Svet Ganov [Sun, 3 May 2015 00:42:44 +0000 (17:42 -0700)]
Add read cell broadcast app op - framework
Change-Id: Icecc9d918db55493ada7a0faa6bfcc41d4114bbd
Svetoslav [Sun, 3 May 2015 00:41:49 +0000 (00:41 +0000)]
Merge "Add camera app op - framework" into mnc-dev
Svetoslav [Fri, 1 May 2015 23:52:41 +0000 (16:52 -0700)]
Add camera app op - framework
Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0
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
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
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
Geoff Mendal [Sat, 2 May 2015 06:29:54 +0000 (06:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
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
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
Geoff Mendal [Sat, 2 May 2015 04:23:06 +0000 (04:23 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
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
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
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
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
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
Lajos Molnar [Sat, 2 May 2015 02:23:06 +0000 (02:23 +0000)]
Merge "media: hook up MediaCodec.setSurface" 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
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
Chong Zhang [Sat, 2 May 2015 02:14:36 +0000 (02:14 +0000)]
Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev
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
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.
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':
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
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
Jose Lima [Wed, 29 Apr 2015 21:32:29 +0000 (14:32 -0700)]
Move ContentInfoExtender from Notification.java to a support library
Bug:
20643107
Change-Id: Idabd8b0ceb4b3c63584296736e0a5015511659e7
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
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.
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':
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
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
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
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.
Raph Levien [Sat, 2 May 2015 00:42:13 +0000 (00:42 +0000)]
Merge "Expose StaticLayout.Builder publicly" 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
Lajos Molnar [Fri, 1 May 2015 22:59:35 +0000 (15:59 -0700)]
media: hook up MediaCodec.setSurface
Bug:
11990461
Change-Id: Id2dc952594c21c6be68e4ffd039c7f74006a2374
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
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
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
Svet Ganov [Fri, 1 May 2015 23:09:51 +0000 (23:09 +0000)]
Merge "Add body sensors app op - framework base" into mnc-dev
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
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""
John Reck [Wed, 15 Apr 2015 22:52:10 +0000 (15:52 -0700)]
Remove Bitmap#getSkBitmap
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
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
Chris Craik [Fri, 1 May 2015 21:36:05 +0000 (21:36 +0000)]
Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev
John Reck [Wed, 15 Apr 2015 20:24:47 +0000 (13:24 -0700)]
Move AssetAtlas off of SkBitmap*
Switched to SkPixelRef*
Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
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
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
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
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.
Chris Craik [Fri, 1 May 2015 21:01:13 +0000 (21:01 +0000)]
Merge "Fix build." into mnc-dev
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
Svet Ganov [Thu, 30 Apr 2015 17:38:13 +0000 (10:38 -0700)]
Add body sensors app op - framework base
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
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
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
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
Chris Craik [Fri, 1 May 2015 20:36:03 +0000 (20:36 +0000)]
Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
Chris Craik [Fri, 1 May 2015 20:36:02 +0000 (20:36 +0000)]
Merge "Update alpha documentation" into mnc-dev
Jorim Jaggi [Fri, 1 May 2015 20:34:21 +0000 (20:34 +0000)]
Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev
Jorim Jaggi [Thu, 30 Apr 2015 18:49:29 +0000 (11:49 -0700)]
Rename supportsAssistGesture to supportsAssist
Bug:
20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
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.
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
Mathieu Chartier [Fri, 1 May 2015 18:52:19 +0000 (18:52 +0000)]
Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev
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
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
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
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.
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
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.
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.
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
OSDN Git Service
