OSDN Git Service
Ruben Brunk [Mon, 3 Aug 2015 16:16:12 +0000 (16:16 +0000)]
am
7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
* commit '
7469060e7855ca5b32f66fbad1a0a4f88737c754':
Make vendor keys visible in Camera2 java APIs.
Ruben Brunk [Mon, 3 Aug 2015 16:09:07 +0000 (16:09 +0000)]
Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
Jason Monk [Mon, 3 Aug 2015 15:23:17 +0000 (15:23 +0000)]
am
66845a36: Add more dump info about emergency calls state
* commit '
66845a36c9eeca5296a2bf86793a5d6bedac1b36':
Add more dump info about emergency calls state
Jason Monk [Mon, 3 Aug 2015 15:09:41 +0000 (11:09 -0400)]
Add more dump info about emergency calls state
Bug:
21549528
Change-Id: Idbd70e2f4b1b3285af283a28dc1933c02ad8d04c
Geoff Mendal [Mon, 3 Aug 2015 14:00:37 +0000 (14:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 3 Aug 2015 13:55:08 +0000 (06:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I35c0512c48a8b1d8f4cb738a879d58421df8d747
Auto-generated-cl: translation import
Geoff Mendal [Mon, 3 Aug 2015 13:55:06 +0000 (06:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: If7cd5e910c7761119f5185926bfe09870a68abad
Auto-generated-cl: translation import
Geoff Mendal [Sat, 1 Aug 2015 05:29:57 +0000 (05:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 1 Aug 2015 05:29:06 +0000 (00:29 -0500)]
Import translations. DO NOT MERGE
Change-Id: I6fa255b9e0118457ee08fb14a503504631889c9d
Auto-generated-cl: translation import
Geoff Mendal [Sat, 1 Aug 2015 05:14:27 +0000 (05:14 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 1 Aug 2015 05:12:03 +0000 (05:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 1 Aug 2015 03:37:35 +0000 (20:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: If10ca2d47b314ddab9e7ae7b475d55eb4ce4d519
Auto-generated-cl: translation import
Geoff Mendal [Sat, 1 Aug 2015 03:34:13 +0000 (20:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I067b513b8b2344bd2f8ee9960ddcc5000e7173c3
Auto-generated-cl: translation import
Svetoslav Ganov [Sat, 1 Aug 2015 02:37:46 +0000 (02:37 +0000)]
am
8dbd4848: Merge "Add per UID control to app ops." into mnc-dev
* commit '
8dbd48485044b1ab25fb8fb5e8e9b9772a3478c4':
Add per UID control to app ops.
Svetoslav Ganov [Sat, 1 Aug 2015 02:28:02 +0000 (02:28 +0000)]
Merge "Add per UID control to app ops." into mnc-dev
Svet Ganov [Thu, 30 Jul 2015 15:44:20 +0000 (08:44 -0700)]
Add per UID control to app ops.
The app ops mananger service maintains a mapping from UID to
a list of packages where each package is mapped to a list of
non-default app op states (default states are inferred and
not stored). Hence, specifying the app op state for a UID
requires setting the app op for each package in the shared
UID.
This is problematic when installing new packages if there
is a non-default app op policy set for another already
installed package in the same UID as the app op for the new
package has to be updated to be in sync. The package installer
cannot do this as it is in another process and the app op
update will not be atomic. Therefore, the app ops manager
service has to support specifying app op policy on a per
UID basis.
We now have a UID state object that contains the per package
non-default app op states as well as the per uid non-default
app op states. If there is a UID policy specified then it
takes precedence over the per package one. Even further,
changing the uid policy updates the package policies in this
UID if the state is non-default. Changing a package app op
state also updates the app op state for the whole UID if
the per UID policy for this op is non-default. Clearing the
app op state for a package, clears the policy for the UID
as well.
bug:
22802981
Change-Id: I78044906d9fcc6066abf07e706c2c88f3397d293
Jan Nordqvist [Sat, 1 Aug 2015 00:39:20 +0000 (00:39 +0000)]
am
cb9c0940: Merge "Added logging in a few error paths for wifi config installation." into mnc-dev
* commit '
cb9c0940d4090f83b5ba76ef1413c2d14f7fdc1b':
Added logging in a few error paths for wifi config installation.
Peng Xu [Sat, 1 Aug 2015 00:35:22 +0000 (00:35 +0000)]
Merge "Suppress camera launch gesture until setup is complete Bug:
22792563" into mnc-dr-dev
Jan Nordqvist [Sat, 1 Aug 2015 00:30:42 +0000 (00:30 +0000)]
Merge "Added logging in a few error paths for wifi config installation." into mnc-dev
Jan Nordqvist [Fri, 31 Jul 2015 22:32:25 +0000 (15:32 -0700)]
Added logging in a few error paths for wifi config installation.
Bug:
22790527
Change-Id: I71b298b98da098f647f52886c3c3a7456cb24d51
Chris Wren [Sat, 1 Aug 2015 00:16:59 +0000 (00:16 +0000)]
am
6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev
* commit '
6e75e7dd988d7704a01528f479421ab5e6012c99':
Instrument printing service for metrics collection.
Ruben Brunk [Thu, 30 Jul 2015 01:19:11 +0000 (18:19 -0700)]
Make vendor keys visible in Camera2 java APIs.
- Add vendor keys to getKeys() calls for CameraCharacteristics,
CaptureRequest, and CaptureResult.
- Vendors can specify whether custom keys show up by listing
visible keys in the REQUEST_AVAILABLE_RESULT_KEYS field.
- Vendor key types are always treated as a primitive (or Rational)
array type corresponding to one of the valid types for
a camera metadata entry.
Bug:
22067625
Change-Id: I6e7dd3db7a8bf533c2ec15ff69ca38824134e971
Chris Wren [Sat, 1 Aug 2015 00:11:16 +0000 (00:11 +0000)]
Merge "Instrument printing service for metrics collection." into mnc-dev
Selim Cinek [Fri, 31 Jul 2015 23:53:33 +0000 (23:53 +0000)]
am
f92a1fdb: Fixed a bug where notifications shadows were blinking out
* commit '
f92a1fdb77311149189ae17244adc51017b89c1e':
Fixed a bug where notifications shadows were blinking out
Selim Cinek [Fri, 31 Jul 2015 23:10:32 +0000 (16:10 -0700)]
Fixed a bug where notifications shadows were blinking out
Bug:
22567770
Change-Id: I2d335241a287d0c64e659221994f19b7c13eccd3
Filip Gruszczynski [Fri, 31 Jul 2015 22:36:53 +0000 (22:36 +0000)]
am
00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev
* commit '
00ab35783c3909c783effbf28da6dda2bf67c1a8':
Make enter reveal animation be zorder top.
Dianne Hackborn [Fri, 31 Jul 2015 22:36:49 +0000 (22:36 +0000)]
am
fb68b0ad: Merge "Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev
* commit '
fb68b0ad344edbba15b961dc444cb24dcfc29995':
Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
Filip Gruszczynski [Fri, 31 Jul 2015 22:31:22 +0000 (22:31 +0000)]
Merge "Make enter reveal animation be zorder top." into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 22:29:34 +0000 (22:29 +0000)]
Merge "Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev
Jean-Michel Trivi [Fri, 31 Jul 2015 22:25:47 +0000 (22:25 +0000)]
am
ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev
* commit '
ffbdb8ad86e6a858f3f8cd812bfe2e3ec5fd4b75':
Fix that shutter sound does not play after ringer mode changes to vibrator
Jean-Michel Trivi [Fri, 31 Jul 2015 22:18:35 +0000 (22:18 +0000)]
Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev
Alan Viverette [Fri, 31 Jul 2015 21:39:03 +0000 (21:39 +0000)]
am
5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev
* commit '
5cca30a4ee28a5e70531508d9ad607107adfaa86':
Revert two changes to LinearLayout measurement
Alan Viverette [Fri, 31 Jul 2015 21:38:59 +0000 (21:38 +0000)]
am
9d8a230f: Revert "View measurement optimization"
* commit '
9d8a230fbd71ac57ef806326f15fa133ba125083':
Revert "View measurement optimization"
Alan Viverette [Fri, 31 Jul 2015 21:30:48 +0000 (21:30 +0000)]
Merge "Revert two changes to LinearLayout measurement" into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 20:10:55 +0000 (13:10 -0700)]
Fix issue #
21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
Change-Id: I928882d42d0546cc6a12e803d96131beaba76d4e
Winson Chung [Fri, 31 Jul 2015 19:55:40 +0000 (19:55 +0000)]
am
c35e670d: Moving removeTask to separate thread.
* commit '
c35e670d5386eb6388eb4e65746b950265312e7a':
Moving removeTask to separate thread.
Alan Viverette [Fri, 31 Jul 2015 19:51:48 +0000 (19:51 +0000)]
Revert "View measurement optimization"
LinearLayout relied on multiple measurement passes to hide a
discrepancy between EXACTLY and non-EXACTLY measurements.
This reverts commit
9cefbda11ee5308145d58b0b99ced0f66a0b1cf9.
Bug:
22810327
Change-Id: I515a80749420d00efc5002fa68221b7c236f03df
Winson Chung [Fri, 31 Jul 2015 01:08:26 +0000 (18:08 -0700)]
Moving removeTask to separate thread.
Bug:
22760556
Change-Id: Iac6eef77e3ba5432ac1cd4aa792e7b2aadc27c01
Winson Chung [Fri, 31 Jul 2015 19:43:30 +0000 (19:43 +0000)]
am
92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev
* commit '
92e0c86fa2b84619ebc3acb6d91434dd17113c61':
Ensuring that we don't try to use and propagate null activity labels.
Deepanshu Gupta [Fri, 31 Jul 2015 19:43:25 +0000 (19:43 +0000)]
Wale Ogunwale [Fri, 31 Jul 2015 19:43:06 +0000 (19:43 +0000)]
am
f7e00dbd: Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev
* commit '
f7e00dbd08038d52c1158eea61e253ff8155569b':
Fixed issue with artifacts during scale-up transition animation
Dianne Hackborn [Fri, 31 Jul 2015 19:42:50 +0000 (19:42 +0000)]
am
ebbc891a: Merge "Fix build." into mnc-dev
* commit '
ebbc891ae4ca835dea278430e3bad42d4630e2af':
Fix build.
Glenn Kasten [Fri, 31 Jul 2015 19:42:43 +0000 (19:42 +0000)]
am
37f559be: Merge "Improve getTimestamp documentation" into mnc-dev
* commit '
37f559be42ef7a765c671cc0852289a9d7e047cc':
Improve getTimestamp documentation
Dianne Hackborn [Fri, 31 Jul 2015 19:42:24 +0000 (19:42 +0000)]
Dianne Hackborn [Fri, 31 Jul 2015 19:42:11 +0000 (19:42 +0000)]
am
c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit '
c1836bb0f1bf3e5ef0911719525da0bab3e53507':
Change MNC codename to just M.
Filip Gruszczynski [Fri, 31 Jul 2015 19:20:40 +0000 (12:20 -0700)]
Make enter reveal animation be zorder top.
This fixes the bug where launcher icons become temporarily visible when
home button is pressed while other activity is starting. By having the
starting activity's animation be zoder top, it will continue to be drawn
on top of the launcher until it animates away.
Bug:
22809202
Change-Id: If5e3c09b7a5df4537c355f94e986766f77ad4943
Jorim Jaggi [Thu, 30 Jul 2015 18:56:36 +0000 (11:56 -0700)]
Fix fingerprint icon screen on animation
Bug:
22807015
Change-Id: I4685085007d87f1b1e1db380d0f899efc4e56240
Winson Chung [Fri, 31 Jul 2015 19:20:51 +0000 (19:20 +0000)]
Merge "Ensuring that we don't try to use and propagate null activity labels." into mnc-dev
Kevin Gabayan [Fri, 31 Jul 2015 19:01:43 +0000 (12:01 -0700)]
Suppress camera launch gesture until setup is complete
Bug:
22792563
Change-Id: I779d15894375ebd2639f41bc5f60317030f927f4
Deepanshu Gupta [Fri, 31 Jul 2015 19:11:07 +0000 (12:11 -0700)]
Fix build.
Change-Id: I82295b758e5ceb42e260d3c36ea2310a9def5190
Winson Chung [Fri, 31 Jul 2015 00:33:31 +0000 (17:33 -0700)]
Ensuring that we don't try to use and propagate null activity labels.
- Also fixes issue with tapping outside bounds not working to dismiss recents
Bug:
21774486
Bug:
22241587
Change-Id: Ib50f6fece8fb150929a1f8cdb01b8e8fe7b665cd
Wale Ogunwale [Fri, 31 Jul 2015 18:45:08 +0000 (18:45 +0000)]
Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 18:19:11 +0000 (18:19 +0000)]
Merge "Fix build." into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 18:17:43 +0000 (11:17 -0700)]
Fix build.
Change-Id: I9c6b6cd354039ff2914837cfe97a783564ded66f
Glenn Kasten [Fri, 31 Jul 2015 18:04:16 +0000 (18:04 +0000)]
Merge "Improve getTimestamp documentation" into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 17:35:34 +0000 (10:35 -0700)]
Fix build.
Change-Id: Icdf6fa14e53a1c030d0d90205d3bf2d7610b6196
Dianne Hackborn [Fri, 31 Jul 2015 17:11:58 +0000 (17:11 +0000)]
Merge "Change MNC codename to just M." into mnc-dev
Alan Viverette [Fri, 31 Jul 2015 16:42:10 +0000 (12:42 -0400)]
Revert two changes to LinearLayout measurement
"Include non-zero dimension views in excess space calculation" and
"Always distribute excess space in LinearLayout measurement" changed
LinearLayout behavior significantly in a way that wasn't covered by
CTS tests.
This reverts commits
da2f3044092318d44173bdb9918f31c592b86a73 and
4fabc021583cfd5cc551eda7d7b9809683a6ca9a.
Bug:
22862047
Change-Id: I8d37a525ccf295445d3239b80e5cacb10bf3c947
Sungmin Choi [Mon, 27 Jul 2015 06:09:49 +0000 (23:09 -0700)]
Fix that shutter sound does not play after ringer mode changes to vibrator
Reproduce sequence:
1. Change ring volume to vibration in Settings > Sound & notification
> Ring volume using touch
2. Launch camera app
3. Capture, but cannot hear shutter sound
4. Even change ringtone to maximum, shutter sound is not played before reboot
Bug:
22589664
Change-Id: I90eb044eaf21f3b558bf050bf1d9f0b33ea4888b
Tyler Gunn [Fri, 31 Jul 2015 16:02:32 +0000 (09:02 -0700)]
resolved conflicts for merge of
d0694da4 to mnc-dr-dev
Change-Id: Ifd2636d0e1b7eae15d412cfa0a948a572c905b3a
Tyler Gunn [Fri, 31 Jul 2015 15:42:48 +0000 (15:42 +0000)]
Merge "Add telecom extra keys required for DMR release." into mnc-dev
Julia Reynolds [Fri, 31 Jul 2015 13:57:02 +0000 (13:57 +0000)]
am
5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev
* commit '
5d6a2d387cd437e6d0c45d0df1bd10ba9db56253':
Fix SysUI crash on device boot.
Julia Reynolds [Fri, 31 Jul 2015 13:49:26 +0000 (13:49 +0000)]
Merge "Fix SysUI crash on device boot." into mnc-dev
Julia Reynolds [Fri, 31 Jul 2015 13:17:20 +0000 (09:17 -0400)]
Fix SysUI crash on device boot.
Bug:
22869066
Change-Id: I55ab64c430899ebc20bfc8a8e4d1e2a7cd12f0cd
Rubin Xu [Fri, 31 Jul 2015 13:15:44 +0000 (13:15 +0000)]
am
9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev
* commit '
9a81a182df634ab7a087752c9a10db67c5d0f256':
Don't always transfer device owner status to other users.
Rubin Xu [Fri, 31 Jul 2015 13:11:08 +0000 (13:11 +0000)]
Merge "Don't always transfer device owner status to other users." into mnc-dev
Benjamin Franz [Fri, 31 Jul 2015 09:42:43 +0000 (09:42 +0000)]
am
d692fcf1: Merge "Add missing return statement" into mnc-dev
* commit '
d692fcf115e57fef8a15c214fb2fcde78a48b45c':
Add missing return statement
Nicolas Prevot [Tue, 28 Jul 2015 19:41:12 +0000 (20:41 +0100)]
Don't always transfer device owner status to other users.
A device owner cannot use device or profile owner policies on
other users unless it is profile owner there. Also limit device
initializer to system apps only.
Bug:
21800830
Change-Id: Ie1abbd891945b91b17ecdf7f73ba93aaa19819be
Benjamin Franz [Fri, 31 Jul 2015 08:22:53 +0000 (08:22 +0000)]
Merge "Add missing return statement" into mnc-dev
Lorenzo Colitti [Fri, 31 Jul 2015 05:24:49 +0000 (05:24 +0000)]
am
496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
* commit '
496a9d269b0778ffa1965f3b11d768fe70fd7719':
Stop supporting legacy ConnectivityManager routing methods in M.
Lorenzo Colitti [Fri, 31 Jul 2015 05:17:08 +0000 (05:17 +0000)]
Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
Wale Ogunwale [Fri, 31 Jul 2015 03:20:16 +0000 (20:20 -0700)]
Fixed issue with artifacts during scale-up transition animation
It is possible to get some artifacts during scale-up transition
animation of some fullscreen activities like Chrome. This is
caused by the clip rect specified by the transformation extending
outside the sys decor rect. We now contain the clip rect within
the system decor rect.
Also note that we don't want to do this for none-fullscreen
activities as it might cause some premature clipping.
Bug:
22830775
Bug:
21727851
Bug:
20652683
Bug:
19523205
Bug:
15046646
https://code.google.com/p/android/issues/detail?id=161362
Change-Id: I33827caaa256ad8fdc0eb3650ef34e95c48a6988
Dave Langemak [Fri, 31 Jul 2015 02:57:24 +0000 (02:57 +0000)]
am
02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit '
02565c3622aa9007d3d5eb4612f200decd05b55c':
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
Hung-ying Tyan [Fri, 31 Jul 2015 02:57:19 +0000 (02:57 +0000)]
am
410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
* commit '
410abcdb41f5bca84574e7b07d3f022d5e05e4c9':
Revise lockdown check in getLegacyVpnInfo()
Dave Langemak [Fri, 31 Jul 2015 02:52:30 +0000 (02:52 +0000)]
Merge changes from topic 'fix-notification-inflation-2' into mnc-dev
* changes:
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
Hung-ying Tyan [Fri, 31 Jul 2015 02:51:32 +0000 (02:51 +0000)]
Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
Geoff Mendal [Fri, 31 Jul 2015 02:45:21 +0000 (02:45 +0000)]
am
bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
bbb47d88d5f129ab1ca30d6a7a41976e47681e37':
Import translations. DO NOT MERGE
Ronghua Wu [Fri, 31 Jul 2015 02:40:28 +0000 (02:40 +0000)]
am
e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev
* commit '
e8b7febd62f899ed8920cbd484e18dea64b3a7ee':
media: use blocks number to find closest size
Geoff Mendal [Fri, 31 Jul 2015 02:38:23 +0000 (02:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Dan Sandler [Fri, 31 Jul 2015 02:33:12 +0000 (22:33 -0400)]
Make DateTimeView more robust to weird contexts.
In particular, some clients (*ahem* SystemUI) have been
known to inflate RemoteViews with unusual derived contexts
that may not have valid application contexts. DateTimeView
can now resist this.
Bug:
22852700
Change-Id: I5e91ae0e66859f5f5efd7b19c0ae6dfbc26bcc54
Dan Sandler [Fri, 31 Jul 2015 02:32:54 +0000 (22:32 -0400)]
Make the RemoteViews context safe for Icons.
Icon needs the RemoteViews' internal context to reflect not
just the Resources of the originating application, but its
package name as well.
Bug:
22840771
Bug:
22852700
Change-Id: I1164cd38d99283982b00daadcf927c7cf63539b3
Ronghua Wu [Fri, 31 Jul 2015 02:32:53 +0000 (02:32 +0000)]
Merge "media: use blocks number to find closest size" into mnc-dev
Geoff Mendal [Fri, 31 Jul 2015 02:15:21 +0000 (19:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22826906
Change-Id: I1c6a84cee28d64dad3b53e727252d237824b673d
Geoff Mendal [Fri, 31 Jul 2015 02:12:14 +0000 (19:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22826906
Change-Id: If1cb05eb42e8e5bd789cdb257dfc3498e4479890
Lorenzo Colitti [Wed, 29 Jul 2015 02:41:21 +0000 (11:41 +0900)]
Stop supporting legacy ConnectivityManager routing methods in M.
The methods startUsingNetworkFeature, stopUsingNetworkFeature and
requestRouteToHost were @removed in all the M preview builds, but
internal and external developers have noted that this imposes
additional burden for applications that need to work across
multiple platform versions because it causes compile-time errors.
We switched from @removed back to @deprecated to avoid these
problems. In order to effectively deprecate these methods, which
are error-prone and insecure, make them throw
UnsupportedOperationException if the app's target SDK is M or
above.
Because there are still one or two places in system code that use
these APIs, exempt Process.SYSTEM_UID and the OMA-DM client from
the check for now.
Bug:
22728205
Change-Id: I790bd32f3aa8067cbb625962a209bb9232f4b58c
Jeff Sharkey [Fri, 31 Jul 2015 01:51:37 +0000 (01:51 +0000)]
am
5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev
* commit '
5db4cc8fee8b919b5f62f222af92a4e995ca6a70':
Handle volumes without visible paths.
Jeff Sharkey [Fri, 31 Jul 2015 01:46:45 +0000 (01:46 +0000)]
Merge "Handle volumes without visible paths." into mnc-dev
Jeff Sharkey [Fri, 31 Jul 2015 01:10:20 +0000 (18:10 -0700)]
Handle volumes without visible paths.
Transient volumes like USB drives are not mounted as visible, so we
shouldn't be kicking off media scanner for them.
Bug:
22545248
Change-Id: Ic8f2d3134f1edb8b2a12e8ff283eceeeb230f48b
Adam Lesinski [Fri, 31 Jul 2015 00:35:18 +0000 (00:35 +0000)]
am
e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev
* commit '
e3b0119f79d11744a7f590510b184feef0f45894':
AAPT: Fix resource versioning
Adam Lesinski [Fri, 31 Jul 2015 00:28:05 +0000 (00:28 +0000)]
Merge "AAPT: Fix resource versioning" into mnc-dev
Selim Cinek [Fri, 31 Jul 2015 00:08:00 +0000 (00:08 +0000)]
am
b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev
* commit '
b9f30b26707b7e8721b1cd03ca96b5a4a4995109':
The heads up now correctly dissapears when clicking
Selim Cinek [Thu, 30 Jul 2015 23:59:59 +0000 (23:59 +0000)]
Merge "The heads up now correctly dissapears when clicking" into mnc-dev
Amit Mahajan [Thu, 30 Jul 2015 23:58:34 +0000 (23:58 +0000)]
am
53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev
* commit '
53c750142332cb33e604266b7c6d09191c32691c':
Add OrSelf to privileged permission check.
Adam Lesinski [Thu, 30 Jul 2015 23:58:30 +0000 (23:58 +0000)]
am
00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
* commit '
00f7cb924e6964c5403c55ae5e7348aad1c8ec7b':
BatteryStats: include mobile radio active count and unknown time in checkin
Amit Mahajan [Thu, 30 Jul 2015 23:54:06 +0000 (23:54 +0000)]
Merge "Add OrSelf to privileged permission check." into mnc-dev
Adam Lesinski [Thu, 30 Jul 2015 23:50:27 +0000 (23:50 +0000)]
Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
Adam Lesinski [Thu, 30 Jul 2015 23:36:29 +0000 (16:36 -0700)]
BatteryStats: include mobile radio active count and unknown time in checkin
These are important values to help diagnose modem related wakeup issues.
Bug:
22803686
Bug:
22857991
Change-Id: Ie0164ebd194567bc10d1165d671a583674a39829
Andre Eisenbach [Thu, 30 Jul 2015 23:47:30 +0000 (23:47 +0000)]
am
3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast
* commit '
3bf1ac54edc77d2249dc9a0ab8291efa70ff76b9':
Bluetooth: Don't call beginBroadcast() while in a broadcast
Selim Cinek [Thu, 30 Jul 2015 00:04:36 +0000 (17:04 -0700)]
The heads up now correctly dissapears when clicking
Bug:
22729955
Change-Id: I977b36823bf936baab527f932b1e5576241f4d71
Amit Mahajan [Thu, 30 Jul 2015 23:04:13 +0000 (16:04 -0700)]
Add OrSelf to privileged permission check.
Bug:
22857263
Change-Id: Ide7105dfd653e3c271330822fb8cee7cf620e35d