OSDN Git Service
Steve McKay [Tue, 3 Nov 2015 21:34:14 +0000 (21:34 +0000)]
Merge "Use StubProvider for functional tests."
Steve McKay [Tue, 27 Oct 2015 00:03:55 +0000 (17:03 -0700)]
Use StubProvider for functional tests.
Add a "UiBot" class for driving the UI from tests.
Add a "DocumentsProviderHelper" class for convenient test doc setup.
Update FilesActivityUiTest to use "TargetContext" which is
necessary in order to perform ContentProvider
operations.
Fix a bug where CopyTest relied on implicit order of roots.
Don't include guava in tests...since it breaks functional tests (incompatible class def).
Add test coverage for:
- basic roots list.
- basic files list.
- Live updates to files list.
- basic delete operations.
Bug:
24988170
Change-Id: I2ec01a5e1a474314cb33efb6e92df0f61dfcc1da
NOTE: This is currently broken at the point I try to init files in the stub roots.
Adam Lesinski [Tue, 3 Nov 2015 21:02:36 +0000 (21:02 +0000)]
Merge "AAPT2: Add Manifest fixing/validation"
Adam Lesinski [Tue, 3 Nov 2015 21:01:41 +0000 (21:01 +0000)]
Merge "AAPT2: Add support for comments in R.java"
John Reck [Tue, 3 Nov 2015 20:40:42 +0000 (20:40 +0000)]
Merge "Revert "Check GLES2 support using EGL instead of qemu.gles""
John Reck [Tue, 3 Nov 2015 20:39:51 +0000 (20:39 +0000)]
Revert "Check GLES2 support using EGL instead of qemu.gles"
This reverts commit
0f897d2fea84c1632377b84f6241d54a8d85f7a3.
Change-Id: Iaf5b22b6b1a5bdb16dd0aaf674d90c09d1bc24a7
Fyodor Kupolov [Tue, 3 Nov 2015 20:23:24 +0000 (20:23 +0000)]
Merge "UserController refactoring"
Fyodor Kupolov [Tue, 3 Nov 2015 20:06:25 +0000 (20:06 +0000)]
Merge "Introduced short-term lock for UMS internal state"
Ben Kwa [Tue, 3 Nov 2015 20:00:40 +0000 (20:00 +0000)]
Merge "Fix focus issues on animated items."
Ben Kwa [Tue, 20 Oct 2015 22:02:33 +0000 (15:02 -0700)]
Fix focus issues on animated items.
Implement a custom ItemAnimator to enable focus to persist across change
animations in the DirectoryFragment's RecyclerView.
Note that this is a temporary stop-gap - a better fix would be to have
the RecyclerView restore focus to the appropriate item after a change
animation.
BUG=
24802917
Change-Id: I4e4e6f758a2ea87e6235533860863c822d71a27a
Fyodor Kupolov [Wed, 28 Oct 2015 21:54:51 +0000 (14:54 -0700)]
Introduced short-term lock for UMS internal state
Added mUsersLock - short-term lock for internal state, when interaction and
synchronization with PM is not required. Modifications to mUsers and
mRemovingUserIds must be guarded by 3 locks: mInstallLock, mPackagesLock and
mUsersLock. While reads can use mUsersLock.
Testing revealed that the following methods in UMS often cause contention:
- exists
- getUserInfo
- getProfileParent
They all now use a short-term lock mUsersLock for reads.
Bug:
24979571
Change-Id: Ie3a22ea7cbb450c7969800fe2a4a2b2516165e5b
Jeff Sharkey [Tue, 3 Nov 2015 19:50:54 +0000 (19:50 +0000)]
Merge "Yell if NDC callers are holding bad locks."
Fyodor Kupolov [Wed, 28 Oct 2015 01:08:56 +0000 (18:08 -0700)]
UserController refactoring
Addressed comments from the previous cl. Added getters for UserController
fields, direct access is no longer allowed. Moved the following methods:
- getUserManagerLocked. Became getUserManager() - because locking is not
necessary, double checked locking will suffice.
- startUserInForeground /showUserSwitchDialog/sendUserSwitchBroadcastsLocked
- handleIncomingUser/unsafeConvertIncomingUserLocked/isUserRunningLocked/
getUsers/getProfileIds
Bug:
24745840
Change-Id: Id5a5cfb9604e08add29bd9a03c8fe5200bc51fef
Jeff Sharkey [Tue, 3 Nov 2015 18:39:42 +0000 (10:39 -0800)]
Yell if NDC callers are holding bad locks.
The current MountService design heavily depends on down-callers not
holding any locks, since the vast majority of events are unsolicited
and bubble up to the framework.
This simple API gives us an easy way to track down people calling
while holding a lock they shouldn't be.
Bug:
25443096
Change-Id: Ifcbda95f00d5be8c1b88d58ca67927e76c713c3e
Chad Brubaker [Tue, 3 Nov 2015 18:38:37 +0000 (18:38 +0000)]
Merge "Add stub isSameTrustConfiguration API"
Jeff Sharkey [Tue, 3 Nov 2015 18:19:24 +0000 (18:19 +0000)]
Merge "Fix deadlock when calling down to vold."
John Reck [Tue, 3 Nov 2015 18:19:15 +0000 (18:19 +0000)]
Merge "Remove almost-all android::Singleton users"
Jeff Sharkey [Tue, 3 Nov 2015 18:15:57 +0000 (10:15 -0800)]
Fix deadlock when calling down to vold.
Gotta put down the lock before you can play the saxophone.
Bug:
25443096
Change-Id: I008c3a8530a2181aad20985e157c6f63208444ee
John Reck [Tue, 3 Nov 2015 18:09:59 +0000 (10:09 -0800)]
Remove almost-all android::Singleton users
Bug:
25426213
Change-Id: I88e6206e8915cce95c3a8a8a82a4bb8fbf668141
Felipe Leme [Tue, 3 Nov 2015 18:02:48 +0000 (18:02 +0000)]
Merge "Added serial number in the bugreport message body."
Gustav Sennton [Tue, 3 Nov 2015 17:50:07 +0000 (17:50 +0000)]
Merge "Load WebView from one out of a list of packages, reland."
Chris Craik [Tue, 3 Nov 2015 17:26:34 +0000 (17:26 +0000)]
Merge "Add unit test failure messages to recordingcanvas/reorderer"
Nicolas Capens [Tue, 3 Nov 2015 17:23:19 +0000 (17:23 +0000)]
Merge "Check GLES2 support using EGL instead of qemu.gles"
Felipe Leme [Fri, 30 Oct 2015 18:59:40 +0000 (11:59 -0700)]
Added serial number in the bugreport message body.
Also labeled information contained in the body (i.e., Build Info: and Serial Number:).
BUG:
21454488
Change-Id: I5f2a62147ca3e1989aebfbd465f3e42b96b655df
Winson Chung [Tue, 3 Nov 2015 16:45:07 +0000 (16:45 +0000)]
Merge "Adding recents experiment override."
Abodunrinwa Toki [Tue, 3 Nov 2015 16:06:38 +0000 (16:06 +0000)]
Merge "Fix failing TextActivityTest."
Abodunrinwa Toki [Tue, 3 Nov 2015 14:08:03 +0000 (14:08 +0000)]
Fix failing TextActivityTest.
It seems like setOrientation(...) is not working.
Instead, fix the orientation of TextViewActivity to portrait.
See: I2f9372997f8301d800109981c6e1a6d4419b641d
Bug:
24495166
Change-Id: I0c5480b7ce6ba1fb8e4e4e3daabe94ebccca4dfd
Thierry Strudel [Tue, 3 Nov 2015 06:57:24 +0000 (06:57 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am:
1942be506e am:
b1fe11fde4 am:
6efac0595f
am:
271dd1da81
* commit '
271dd1da81735a3cb0856db0dbb8634a6c4cc831':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:51:38 +0000 (06:51 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am:
1942be506e am:
b1fe11fde4
am:
6efac0595f
* commit '
6efac0595f4da7f8009aa5da26a5ca024bbb0e4f':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:45:12 +0000 (06:45 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am:
1942be506e
am:
b1fe11fde4
* commit '
b1fe11fde44b4ac56c48f91cd27ced7ac4b0469f':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Brian Carlstrom [Tue, 3 Nov 2015 06:38:38 +0000 (22:38 -0800)]
Fix layoutlib-tests build by adding dummy implementation of IWindowSession.repositionChild to BridgeWindowSession
Change-Id: I9c3a609c76716b35595b82a33f32883d4f46c517
Thierry Strudel [Tue, 3 Nov 2015 06:39:58 +0000 (06:39 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
am:
1942be506e
* commit '
1942be506eb16589e3059fa62ea7b718440fb386':
NetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Tue, 3 Nov 2015 06:35:59 +0000 (06:35 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
Nicolas Capens [Tue, 3 Nov 2015 05:28:59 +0000 (00:28 -0500)]
Check GLES2 support using EGL instead of qemu.gles
Bug
25435727
Change-Id: I9b8816cc8bfc2567ac475888cd57f2b9e62dad4f
Tyler Gunn [Tue, 3 Nov 2015 05:04:36 +0000 (05:04 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am:
8b86c76296 am:
48a0c3ae8d am:
e0eaa03307
am:
6ebf6a27a7
* commit '
6ebf6a27a772f3a21b575aaa88df46f773934214':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:59:44 +0000 (04:59 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am:
8b86c76296 am:
48a0c3ae8d
am:
e0eaa03307
* commit '
e0eaa03307f2327080becffab3245e33d674a1fe':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:54:47 +0000 (04:54 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am:
8b86c76296
am:
48a0c3ae8d
* commit '
48a0c3ae8dd0d3944a3cffa2bafec47f9bc346d6':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:49:33 +0000 (04:49 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
am:
8b86c76296
* commit '
8b86c7629676eeea490531b2a412873e0196eb6f':
Improve comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Tue, 3 Nov 2015 04:44:53 +0000 (04:44 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
Jeff Sharkey [Tue, 3 Nov 2015 03:52:11 +0000 (03:52 +0000)]
Merge "Let's sprinkle some FastJNI into Resources."
Jeff Sharkey [Tue, 3 Nov 2015 02:39:45 +0000 (18:39 -0800)]
Let's sprinkle some FastJNI into Resources.
Before:
benchmark us linear runtime
GetColor 14.9 ===========
GetInteger 19.9 ===============
GetLayoutAndTraverse 38.4 =============================
GetString 38.5 ==============================
After:
benchmark us linear runtime
GetColor 13.9 ==========
GetInteger 18.8 ==============
GetLayoutAndTraverse 38.1 =============================
GetString 38.2 ==============================
Change-Id: I8c20e14182d2645bc62a0e7fc6345e298b11933c
Sanket Padawe [Tue, 3 Nov 2015 03:04:28 +0000 (03:04 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am:
b57c65b00e am:
71f018a411 am:
391c87dea8
am:
535c6fbaa5
* commit '
535c6fbaa51ece3ecdbf9e5ff1147623a36cedaf':
Fix a crash while printing ICCID because of alphabets in UICC.
Selim Cinek [Tue, 3 Nov 2015 03:03:12 +0000 (03:03 +0000)]
Fixed a bug where the panel could get stuck closing am:
b0e4f9e97e am:
157e60f7a2 am:
341d544693
am:
e4fd7227eb
* commit '
e4fd7227ebffb6f33c875c4d1bf48be75ae9f33a':
Fixed a bug where the panel could get stuck closing
Glenn Kasten [Tue, 3 Nov 2015 03:01:54 +0000 (03:01 +0000)]
Merge "MidiManager: fix double BTLE callback" am:
bbf34d0bd1 am:
58f41c3b76
am:
9418dca1dc
* commit '
9418dca1dc30506a83dec0b35343d2a805587cc8':
MidiManager: fix double BTLE callback
Glenn Kasten [Tue, 3 Nov 2015 03:00:05 +0000 (03:00 +0000)]
Merge "MidiService: update listener with current status when registered" am:
d4e9b9e4ac am:
350dc16475
am:
1ec066b927
* commit '
1ec066b927233c2b2592a265819b85d9dc7b179d':
MidiService: update listener with current status when registered
Svetoslav Ganov [Tue, 3 Nov 2015 02:58:38 +0000 (02:58 +0000)]
Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev am:
a47f9dad2b am:
c4c1866228 am:
023f4d158d
am:
f2e81e904a -s ours
* commit '
f2e81e904a57660eabcb4c0c24bf8e6e6b1f6467':
Don't try overriding system fixed permissions on install
Chris Craik [Tue, 3 Nov 2015 02:11:50 +0000 (02:11 +0000)]
Merge "Add region-tracking to OffscreenBuffers"
Chris Craik [Tue, 3 Nov 2015 02:06:59 +0000 (18:06 -0800)]
Add unit test failure messages to recordingcanvas/reorderer
Change-Id: I3be7f096cdfb4eb66063c7e4d50f5bd859f43fbd
Sanket Padawe [Tue, 3 Nov 2015 02:04:40 +0000 (02:04 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am:
b57c65b00e am:
71f018a411
am:
391c87dea8
* commit '
391c87dea8a66a03be07527e1fc15c659e6072d0':
Fix a crash while printing ICCID because of alphabets in UICC.
Jeff Sharkey [Tue, 3 Nov 2015 02:01:33 +0000 (02:01 +0000)]
Merge "Let's sprinkle some FastJNI into Parcel."
Sanket Padawe [Tue, 3 Nov 2015 01:58:05 +0000 (01:58 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am:
b57c65b00e
am:
71f018a411
* commit '
71f018a411c55383f395adc52d8363d6103529d3':
Fix a crash while printing ICCID because of alphabets in UICC.
Sanket Padawe [Tue, 3 Nov 2015 01:52:13 +0000 (01:52 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
am:
b57c65b00e
* commit '
b57c65b00efbcc6c8ed5a64b2c314dbca72d5554':
Fix a crash while printing ICCID because of alphabets in UICC.
Sanket Padawe [Tue, 3 Nov 2015 01:47:04 +0000 (01:47 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
Selim Cinek [Tue, 3 Nov 2015 01:34:31 +0000 (01:34 +0000)]
Fixed a bug where the panel could get stuck closing am:
b0e4f9e97e am:
157e60f7a2
am:
341d544693
* commit '
341d544693c47ba9c5a60108e0ed4eabb9e2e069':
Fixed a bug where the panel could get stuck closing
Jeff Sharkey [Tue, 3 Nov 2015 01:27:48 +0000 (17:27 -0800)]
Let's sprinkle some FastJNI into Parcel.
Before:
benchmark ns linear runtime
ReadByte 918 ===========================
ReadInt 877 ==========================
ReadLong 880 ==========================
WriteByte 1002 ==============================
WriteInt 945 ============================
WriteLong 957 ============================
vm: app_process
After:
benchmark ns linear runtime
ReadByte 824 ===========================
ReadInt 780 =========================
ReadLong 780 =========================
WriteByte 895 =============================
WriteInt 907 ==============================
WriteLong 851 ============================
vm: app_process
Change-Id: I746fe8ea3607e29d86007bd144339c84b063c360
Chris Craik [Mon, 2 Nov 2015 22:52:21 +0000 (14:52 -0800)]
Add region-tracking to OffscreenBuffers
Change-Id: I024c7219c080b9a89888517f5a89d49dfe8065ba
Selim Cinek [Tue, 3 Nov 2015 01:29:27 +0000 (01:29 +0000)]
Fixed a bug where the panel could get stuck closing am:
b0e4f9e97e
am:
157e60f7a2
* commit '
157e60f7a2ec40bdbb3bde0ea41f1c92bef93a1e':
Fixed a bug where the panel could get stuck closing
Selim Cinek [Tue, 3 Nov 2015 01:21:43 +0000 (01:21 +0000)]
Fixed a bug where the panel could get stuck closing
am:
b0e4f9e97e
* commit '
b0e4f9e97e272783f08b2245219239aaa667073d':
Fixed a bug where the panel could get stuck closing
Yury Khmel [Tue, 3 Nov 2015 01:19:22 +0000 (01:19 +0000)]
Merge "Distinguish Andromeda and Android for SurfaceComposition test."
Adam Lesinski [Tue, 3 Nov 2015 00:10:55 +0000 (16:10 -0800)]
AAPT2: Add Manifest fixing/validation
Change-Id: I7f6d8b74d1c590adc356b4da55cb6cb777cdf1da
Winson [Tue, 3 Nov 2015 00:38:25 +0000 (16:38 -0800)]
Fixing build breakage.
Change-Id: Idf8759c7bc88af534103731eef535fc310bed7e5
Todd Kennedy [Tue, 3 Nov 2015 00:20:55 +0000 (00:20 +0000)]
Merge "Implement shell commands for package and user services"
Todd Kennedy [Fri, 30 Oct 2015 18:32:16 +0000 (11:32 -0700)]
Implement shell commands for package and user services
Only implement the 'list' package service command. More will follow
in future CLs.
Change-Id: Iae225cd4ee63c7d468a4fd882d8cb4b6b76ccc09
Mikhail Naganov [Tue, 3 Nov 2015 00:11:03 +0000 (00:11 +0000)]
Merge "Small update to WebResourceRequest.isRedirect"
Jason Monk [Mon, 2 Nov 2015 23:51:02 +0000 (23:51 +0000)]
Merge "Always show tiles in the new QS"
Jason Monk [Mon, 2 Nov 2015 23:48:38 +0000 (18:48 -0500)]
Always show tiles in the new QS
Change-Id: I536d19206fd03194b76b01a0f159f0a241d19c8b
Sanket Padawe [Mon, 2 Nov 2015 23:45:18 +0000 (15:45 -0800)]
Fix a crash while printing ICCID because of alphabets in UICC.
Bug:
25401769
Change-Id: Ieda058817b8d3cb4b1696fd9932bd0f10da55573
Mikhail Naganov [Mon, 2 Nov 2015 23:38:29 +0000 (15:38 -0800)]
Small update to WebResourceRequest.isRedirect
Specify that 'isRedirect' is only true for server-side redirects.
Bug:
22346196
Change-Id: I9a8c31476c796265f554327dfff46778c5f84399
Glenn Kasten [Mon, 2 Nov 2015 23:10:11 +0000 (23:10 +0000)]
Merge "MidiManager: fix double BTLE callback" am:
bbf34d0bd1
am:
58f41c3b76
* commit '
58f41c3b76b7b32c430d5dde799aeddc5034d88c':
MidiManager: fix double BTLE callback
Glenn Kasten [Mon, 2 Nov 2015 23:08:35 +0000 (23:08 +0000)]
Merge "MidiService: update listener with current status when registered" am:
d4e9b9e4ac
am:
350dc16475
* commit '
350dc16475c6d64d2837ed19fa736fcdd423f61a':
MidiService: update listener with current status when registered
Glenn Kasten [Mon, 2 Nov 2015 23:01:49 +0000 (23:01 +0000)]
Merge "MidiManager: fix double BTLE callback"
am:
bbf34d0bd1
* commit '
bbf34d0bd1bc4f85c9af614291925f5da1fa0459':
MidiManager: fix double BTLE callback
Glenn Kasten [Mon, 2 Nov 2015 23:00:15 +0000 (23:00 +0000)]
Merge "MidiService: update listener with current status when registered"
am:
d4e9b9e4ac
* commit '
d4e9b9e4ac4196d37b0a5e59867f5a51018f4087':
MidiService: update listener with current status when registered
Glenn Kasten [Mon, 2 Nov 2015 22:51:02 +0000 (22:51 +0000)]
Merge "MidiManager: fix double BTLE callback"
Glenn Kasten [Mon, 2 Nov 2015 22:50:50 +0000 (22:50 +0000)]
Merge "MidiService: update listener with current status when registered"
Winson [Mon, 2 Nov 2015 22:35:34 +0000 (14:35 -0800)]
Adding recents experiment override.
Bug:
25374687
Change-Id: I1e28c5c51aff2787fbbed6e9f39ac1f05e3274d1
Makoto Onuki [Wed, 28 Oct 2015 00:15:38 +0000 (17:15 -0700)]
Make UserManager enforce user restrictions, not DPM.
- Now even if a user restriction is set via UserManager, it'll be correctly
enforced.
- Changed the way AudioService enforces the OP_MUTE_MICROPHONE and
OP_AUDIO_MASTER_VOLUME app ops -- previously, when they're set, even a muting
call would be rejected. This was why DPMS.setUserRestriction() used different
calling orders for DISALLOW_UNMUTE_MICROPHONE/DISALLOW_ADJUST_VOLUME depending
on setting them or clearing them.
Now, even when the app ops are set, we still allow muting calls.
Bug
23902097
Bug
24981972
Change-Id: I865b5de43e15f5955f94006475a5ec6254904d31
Makoto Onuki [Mon, 2 Nov 2015 22:00:09 +0000 (22:00 +0000)]
Merge "Allow DO to disable camera device-wise."
Selim Cinek [Mon, 2 Nov 2015 21:42:58 +0000 (13:42 -0800)]
Fixed a bug where the panel could get stuck closing
When mClosing was set even though the panel was not
expanding, the variable was never reset leading to
bad states like the notification shade not updating,
people missing calls and similar bad bugs.
Bug:
25338991
Change-Id: I4362fda257770c98c5f9ba75a5622b14f74dc5ae
Phil Burk [Mon, 2 Nov 2015 21:38:36 +0000 (21:38 +0000)]
Merge "UsbMidiDeviceJNI: fix race condition"
Makoto Onuki [Wed, 28 Oct 2015 23:43:10 +0000 (16:43 -0700)]
Allow DO to disable camera device-wise.
Bug
24538855
Change-Id: I421690f14ee57fa818d2b233fe48a90a0a575a9e
Phil Burk [Fri, 21 Aug 2015 22:22:35 +0000 (15:22 -0700)]
MidiManager: fix double BTLE callback
Stop openBluetoothDevice() from calling its callback twice.
Bug:
23218338
Change-Id: I2e738b22a124c0336c46bef05680a82ee1f59e79
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
Phil Burk [Thu, 6 Aug 2015 06:32:54 +0000 (23:32 -0700)]
MidiService: update listener with current status when registered
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.
Bug:
22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
b2355940e3e697deeecd1b6511cd5094f9dc553a)
Rob Carr [Mon, 2 Nov 2015 21:31:08 +0000 (21:31 +0000)]
Merge "Ensure crop rect is scaled appropriately."
Rob Carr [Mon, 2 Nov 2015 21:30:56 +0000 (21:30 +0000)]
Merge "Sync SurfaceView position changes to parent render."
Jun Mukai [Mon, 2 Nov 2015 21:27:24 +0000 (21:27 +0000)]
Merge "Fix: ToolType() check -> isFromSource()."
Svetoslav Ganov [Mon, 2 Nov 2015 21:18:22 +0000 (21:18 +0000)]
Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev am:
a47f9dad2b am:
c4c1866228
am:
023f4d158d
* commit '
023f4d158d96bb4237733db0a1e124eae499d7cc':
Don't try overriding system fixed permissions on install
Chris Craik [Mon, 2 Nov 2015 21:16:37 +0000 (21:16 +0000)]
Merge "Initial HW layer support in new reorderer/renderer"
Jun Mukai [Mon, 2 Nov 2015 21:15:00 +0000 (13:15 -0800)]
Fix: ToolType() check -> isFromSource().
Change-Id: I8e13a179dc076cc44248662e6e8fd60e8cc69a3f
Svetoslav Ganov [Mon, 2 Nov 2015 21:10:49 +0000 (21:10 +0000)]
Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev am:
a47f9dad2b
am:
c4c1866228
* commit '
c4c1866228a776758d71cf4d171a17fa01891d89':
Don't try overriding system fixed permissions on install
Svetoslav Ganov [Mon, 2 Nov 2015 21:04:25 +0000 (21:04 +0000)]
Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev
am:
a47f9dad2b
* commit '
a47f9dad2bd70b594e445a6a448877122f28517a':
Don't try overriding system fixed permissions on install
Chris Craik [Wed, 28 Oct 2015 23:50:44 +0000 (16:50 -0700)]
Initial HW layer support in new reorderer/renderer
Shares vast majority of clipped savelayer code, with only minor
differences in lifecycle.
Doesn't yet handle fill region, resize, or window transform.
Change-Id: Iabdd71811590d2b937eb11e1b01ce556ade54a5a
Svetoslav Ganov [Mon, 2 Nov 2015 20:57:12 +0000 (20:57 +0000)]
Merge "Don't try overriding system fixed permissions on install" into mnc-dr-dev
Wale Ogunwale [Mon, 2 Nov 2015 20:38:39 +0000 (20:38 +0000)]
Merge "Added StackId object for checking what features a stack supports"
Svetoslav Ganov [Mon, 2 Nov 2015 20:00:13 +0000 (20:00 +0000)]
Merge "Allow verifier to grant permissions" into mnc-dr-dev am:
cfa233eefb am:
22d7f4c2ed am:
6423c0a29b
am:
bd4168540f
* commit '
bd4168540f009c71af1242e5b7866146c8724d6f':
Allow verifier to grant permissions
Glenn Kasten [Mon, 2 Nov 2015 19:55:37 +0000 (19:55 +0000)]
Merge "Update AudioManager.getProperty documentation"
Glenn Kasten [Mon, 2 Nov 2015 19:54:41 +0000 (19:54 +0000)]
Merge "CDD for pro audio feature does not specify acoustics"
Adam Lesinski [Fri, 30 Oct 2015 23:31:42 +0000 (16:31 -0700)]
AAPT2: Add support for comments in R.java
Change-Id: Iaa5f3b75bf7de9dbf458fa5c452f7312989f4c4f
Svetoslav Ganov [Mon, 2 Nov 2015 19:52:38 +0000 (19:52 +0000)]
Merge "Allow verifier to grant permissions" into mnc-dr-dev am:
cfa233eefb am:
22d7f4c2ed
am:
6423c0a29b
* commit '
6423c0a29bfb3191787febf3755539948514fb61':
Allow verifier to grant permissions
Svetoslav Ganov [Mon, 2 Nov 2015 19:45:17 +0000 (19:45 +0000)]
Merge "Allow verifier to grant permissions" into mnc-dr-dev am:
cfa233eefb
am:
22d7f4c2ed
* commit '
22d7f4c2eddef09e0ceb16aadff2860a184a68d8':
Allow verifier to grant permissions
Svet Ganov [Mon, 2 Nov 2015 17:32:01 +0000 (09:32 -0800)]
Don't try overriding system fixed permissions on install
bug:
25397466
Change-Id: Ie92ec000a94b757178ddfdd9384407535f4af9db