OSDN Git Service
Paul Mclean [Thu, 6 Aug 2015 19:06:11 +0000 (19:06 +0000)]
am
c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev
* commit '
c770b7a537350930dab6489c1e2a6f7e46dc47d1':
Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Paul Mclean [Thu, 6 Aug 2015 18:58:33 +0000 (18:58 +0000)]
Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev
Alan Viverette [Thu, 6 Aug 2015 17:55:02 +0000 (17:55 +0000)]
am
c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit '
c7f8133fa1ff78fea5a54974b5987791cb012f84':
Update anchor background on the correct view in PopupWindow
Alan Viverette [Thu, 6 Aug 2015 17:48:22 +0000 (17:48 +0000)]
Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
Dianne Hackborn [Thu, 6 Aug 2015 16:55:05 +0000 (16:55 +0000)]
am
6b0f1e78: Merge "Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '
6b0f1e78b841a32b45f513d283202e3af90c6a73':
Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult
Dianne Hackborn [Thu, 6 Aug 2015 16:48:34 +0000 (16:48 +0000)]
Merge "Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
Alan Viverette [Thu, 6 Aug 2015 16:36:47 +0000 (12:36 -0400)]
Update anchor background on the correct view in PopupWindow
We were always setting the background of the decor view when the
"above anchor" state changed, rather than the background view.
Bug:
22970244
Change-Id: I3cd7202767ee47cb415736bb3c07369801abccd8
Chet Haase [Thu, 6 Aug 2015 16:29:00 +0000 (16:29 +0000)]
am
da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit '
da493aa6eab24de98b63cc63c457f5b899da3ad2':
Avoid changing internal state of shared drawable
Chet Haase [Thu, 6 Aug 2015 16:23:20 +0000 (16:23 +0000)]
Merge "Avoid changing internal state of shared drawable" into mnc-dev
Paul McLean [Thu, 6 Aug 2015 15:35:55 +0000 (09:35 -0600)]
Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Bug:
22792346
Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75
Alan Treadway [Thu, 6 Aug 2015 15:52:38 +0000 (15:52 +0000)]
am
190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '
190a88d2ce6a08d0eb98d774b81e5ca6b82b45f8':
Update documentation of DevicePolicyManager intents.
Alan Treadway [Thu, 6 Aug 2015 15:47:34 +0000 (15:47 +0000)]
Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
Alan Treadway [Tue, 28 Jul 2015 10:49:35 +0000 (11:49 +0100)]
Update documentation of DevicePolicyManager intents.
Add additional information about the intentions of result codes in
device-owner and profile-owner launch intents, in alignment with
changes made in http://ag/732321.
Bug:
21063241
Change-Id: I0e0a931739cee5f46e8fc7622fe1de49e26dcb0a
Chet Haase [Thu, 6 Aug 2015 04:44:42 +0000 (21:44 -0700)]
Avoid changing internal state of shared drawable
An optimization in ImageView nulled out the internal bitmap of a cached
internal BitmapDrawable object created to wrap a bitmap set on the ImageView.
However, apps can get ahold of that cached object via Drawable.getBitmap(),
resulting in having the state of that object they may be using changing out
from under them.
The change is to null out the cached object when getDrawable() is called, to avoid
leaking internal state that we may change.
That way, the app can continue to use that object if they want to, but we are no longer
relying on it internally, and will create a new one when needed.
Issue #
22930646 [1P Regression from L] ImageView is blanked out in Activity in Google Express
Change-Id: Ic86cb93be4897b6ba247c1fabcda507e4ba01300
Michael Wright [Thu, 6 Aug 2015 13:59:40 +0000 (13:59 +0000)]
am
d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit '
d5a6df6d228036258d616245502c1a4f85ba4b2e':
Make the NullVibrator really null.
Michael Wright [Thu, 6 Aug 2015 13:59:32 +0000 (13:59 +0000)]
am
eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev
* commit '
eb7e3d7e456177f7848834759b9a7f6f78a05f7a':
Don't dispatch when non-interactive and the display is off.
Michael Wright [Thu, 6 Aug 2015 13:52:34 +0000 (13:52 +0000)]
Merge "Make the NullVibrator really null." into mnc-dev
Michael Wright [Thu, 6 Aug 2015 13:50:37 +0000 (13:50 +0000)]
Merge "Don't dispatch when non-interactive and the display is off." into mnc-dev
Julia Reynolds [Thu, 6 Aug 2015 13:48:36 +0000 (13:48 +0000)]
am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
a3b5a61271bde79ef1072b13ed14525ce53bf62b':
Store ringer mode on entering DND mode so it can be restored on exit.
Julia Reynolds [Thu, 6 Aug 2015 13:41:01 +0000 (13:41 +0000)]
Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
Geoff Mendal [Thu, 6 Aug 2015 04:20:12 +0000 (04:20 +0000)]
am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
375c792c176be43720da47db2cfced23613f537c':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:12:38 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Mitchell Wills [Thu, 6 Aug 2015 02:30:36 +0000 (02:30 +0000)]
am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
d14c48444a40fa2f964461e2f1317bcc3e256295':
Pass connection configuration when setting wifi info
Mitchell Wills [Thu, 6 Aug 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Pass connection configuration when setting wifi info" into mnc-dev
Yusuke Sato [Thu, 6 Aug 2015 01:39:44 +0000 (01:39 +0000)]
am
61234dea: am
bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
* commit '
61234deafe78ded05569edfab24536cdb4bd7720':
Clean up AssetManager::scanAndMergeZipLocked
Geoff Mendal [Thu, 6 Aug 2015 00:54:19 +0000 (17:54 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22842106
Change-Id: I473bc0dc200e1eec3bd0f907526fcf808ee86e36
Yusuke Sato [Wed, 5 Aug 2015 23:38:47 +0000 (23:38 +0000)]
am
bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
* commit '
bd4c482be9c060d92919080c37e0d14fca94d2aa':
Clean up AssetManager::scanAndMergeZipLocked
Amit Mahajan [Wed, 5 Aug 2015 23:19:46 +0000 (23:19 +0000)]
am
be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit '
be948f5a9f519210c5522060ec9ee3bc77eb077e':
Removing tethering overlay for mcc202-mnc05 (VF Greece).
Amit Mahajan [Wed, 5 Aug 2015 23:09:58 +0000 (23:09 +0000)]
Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
Jim Miller [Wed, 5 Aug 2015 22:51:43 +0000 (22:51 +0000)]
am
120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '
120fc2c74eb290e06cddf1b52d363338f940c612':
Disable fingerprint when remotely reset by DPM
Jim Miller [Wed, 5 Aug 2015 22:47:57 +0000 (22:47 +0000)]
Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
Mitchell Wills [Mon, 3 Aug 2015 16:46:08 +0000 (09:46 -0700)]
Pass connection configuration when setting wifi info
This allows the both the ssid and connection info to be verified when
updating wifi info.
Bug:
22797622
Change-Id: I82d771a299e17469683516c6b1077cb260981812
Yorke Lee [Wed, 5 Aug 2015 22:20:43 +0000 (22:20 +0000)]
am
f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit '
f0affc6d46849e844bec9ddc755ffae0042e443f':
Correctly hide setConnectionService
Yusuke Sato [Wed, 5 Aug 2015 22:15:50 +0000 (22:15 +0000)]
Merge "Clean up AssetManager::scanAndMergeZipLocked"
Yorke Lee [Wed, 5 Aug 2015 22:13:07 +0000 (22:13 +0000)]
Merge "Correctly hide setConnectionService" into mnc-dev
Dianne Hackborn [Wed, 5 Aug 2015 22:01:28 +0000 (15:01 -0700)]
Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult
Add new Activity callback to tell it when its saved state has
been invalidated.
The problem is that delivering the permission result does not go
through a path where the compatibility code can see it first to
mark its fragment manager as no longer having saved state. So this
new callback gives it a place to do that.
Change-Id: I5a4a185d9c746bae1afb5c588aba82c8daccf079
Yusuke Sato [Wed, 5 Aug 2015 20:14:53 +0000 (13:14 -0700)]
Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)
Change-Id: Icea0ac00c56b5c8aa21134fc49b518cda4759e36
Deepanshu Gupta [Wed, 5 Aug 2015 21:19:52 +0000 (21:19 +0000)]
am
2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '
2c1a22d91607e18c7618e79ab026d3c5c4ce8949':
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
Deepanshu Gupta [Wed, 5 Aug 2015 21:11:40 +0000 (21:11 +0000)]
Merge changes I85106f37,I7db398aa into mnc-dev
* changes:
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
Paul Mclean [Wed, 5 Aug 2015 21:00:46 +0000 (21:00 +0000)]
am
8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
* commit '
8eaf18b0ab77184f16870428258650bd12bb2ea5':
Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
Paul Mclean [Wed, 5 Aug 2015 20:50:29 +0000 (20:50 +0000)]
Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
Jim Miller [Wed, 5 Aug 2015 20:03:21 +0000 (13:03 -0700)]
Disable fingerprint when remotely reset by DPM
When the device is lost or stolen, it's safer to
fall back to strong authentication (pin, pattern or
password). This disables fingerprint like we do with
trust agents.
Fixes bug
21620081
Change-Id: I7bbe54be3721b2f160b783daeb3acbe434705046
Paul McLean [Fri, 31 Jul 2015 15:28:22 +0000 (09:28 -0600)]
Documenting behavior of returning a 0-length array for formats,
channels, rates queries for analog devices.
Bug:
22729461
Change-Id: I3cb1d586f6264e3627cbb0261a3b2c74ca51cf6b
Phil Burk [Wed, 5 Aug 2015 19:50:46 +0000 (19:50 +0000)]
am
881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
* commit '
881cd15519535e493d497fefd857f8fe0236c774':
MidiManager: use ConcurrentHashMap
Phil Burk [Wed, 5 Aug 2015 19:43:21 +0000 (19:43 +0000)]
Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
Vladislav Kaznacheev [Wed, 5 Aug 2015 19:42:25 +0000 (19:42 +0000)]
am
8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
* commit '
8cc00243423e22a36c518cd5ece97b45271ae5e8':
Keep OverScroller.SplineOverScroller state consistent.
Vladislav Kaznacheev [Wed, 5 Aug 2015 19:34:38 +0000 (19:34 +0000)]
Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
Yusuke Sato [Wed, 5 Aug 2015 19:05:17 +0000 (19:05 +0000)]
am
3383b141: am
a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
* commit '
3383b141c3ac4426279e649ebcee535890203c3f':
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
Amit Mahajan [Wed, 5 Aug 2015 18:11:56 +0000 (11:11 -0700)]
Removing tethering overlay for mcc202-mnc05 (VF Greece).
Bug:
22942869
Change-Id: I1d80ab3a66f7e1cd8e497b0d4236f80b0a126228
Yohei Yukawa [Wed, 5 Aug 2015 18:07:03 +0000 (18:07 +0000)]
am
db221acc: Merge "Reduce log spam for the ease of debugging Bug
22857361." into mnc-dev
* commit '
db221acce269245d630e8eb456501c5c6241447b':
Reduce log spam for the ease of debugging Bug
22857361.
Ajay Panicker [Wed, 5 Aug 2015 18:00:49 +0000 (18:00 +0000)]
am
cda6e878: Implement Bluetooth settings factory reset (2/5)
* commit '
cda6e878cd1b11e10c0b9b4b903b14e11586a963':
Implement Bluetooth settings factory reset (2/5)
Yohei Yukawa [Wed, 5 Aug 2015 17:59:23 +0000 (17:59 +0000)]
Merge "Reduce log spam for the ease of debugging Bug
22857361." into mnc-dev
Yusuke Sato [Wed, 5 Aug 2015 17:58:57 +0000 (17:58 +0000)]
am
a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
* commit '
a024acb8bab7e0e04f709fc9f927575f448e11db':
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
Yusuke Sato [Wed, 5 Aug 2015 17:46:18 +0000 (17:46 +0000)]
Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
Svetoslav Ganov [Wed, 5 Aug 2015 17:36:02 +0000 (17:36 +0000)]
am
e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev
* commit '
e72377e17a837acbe1e537ac737731f6b869fe1e':
Fix app ops regressions introduced by the per UID policy change
Ajay Panicker [Tue, 28 Jul 2015 23:52:09 +0000 (16:52 -0700)]
Implement Bluetooth settings factory reset (2/5)
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default
Bug:
16161518
Svetoslav Ganov [Wed, 5 Aug 2015 17:22:42 +0000 (17:22 +0000)]
Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev
Mitchell Wills [Wed, 5 Aug 2015 17:09:00 +0000 (17:09 +0000)]
am
bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev
* commit '
bce3eb22afcd57b7f1bdde26030f8c44bb885a4b':
Fix incorrect default wifi power draw values
Rubin Xu [Wed, 5 Aug 2015 17:00:22 +0000 (17:00 +0000)]
am
ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
* commit '
ab868effb7a54bc6a6b2d35412fe466c0adc7f55':
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
Makoto Onuki [Wed, 5 Aug 2015 17:00:16 +0000 (17:00 +0000)]
am
86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
* commit '
86ee3a57e428b14023bc0bdbd6cb8f8bc206be74':
READ_SMS allows getLine1Number() [1/3]
Mitchell Wills [Wed, 5 Aug 2015 16:59:23 +0000 (16:59 +0000)]
Merge "Fix incorrect default wifi power draw values" into mnc-dev
Rubin Xu [Wed, 5 Aug 2015 16:55:50 +0000 (16:55 +0000)]
Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
Makoto Onuki [Wed, 5 Aug 2015 16:55:35 +0000 (16:55 +0000)]
Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
Rubin Xu [Wed, 5 Aug 2015 15:29:13 +0000 (16:29 +0100)]
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
Starting from M, this extra is also supported in NFC bump provisioning.
Bug:
22914251
Change-Id: I835d12918c5de4ff782245def6565eeb0f052934
Niels Egberts [Wed, 5 Aug 2015 16:04:31 +0000 (16:04 +0000)]
am
6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
* commit '
6bdc4637d7ac1df86e9d745ac483987107a71282':
NPE occured when trying to parcel voice features.
Niels Egberts [Wed, 5 Aug 2015 15:57:55 +0000 (15:57 +0000)]
Merge "NPE occured when trying to parcel voice features." into mnc-dev
Niels Egberts [Wed, 5 Aug 2015 14:41:18 +0000 (15:41 +0100)]
NPE occured when trying to parcel voice features.
The default features member should be an empty list instead of null.
Bug:
22404239
Change-Id: Ia39982f17fd3b3cd0f3556435170aed2fac14fb8
Ian Pedowitz [Wed, 5 Aug 2015 14:43:28 +0000 (14:43 +0000)]
am
df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
* commit '
df5a66110777554d5b163693ac8395d7c21c328f':
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
Ian Pedowitz [Wed, 5 Aug 2015 14:34:13 +0000 (14:34 +0000)]
Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
Ian Pedowitz [Wed, 5 Aug 2015 14:23:43 +0000 (14:23 +0000)]
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
This reverts commit
845d14db9066c3262f270237b52e315aa71508b2.
Bug:
22942480
Bug:
22902898
Change-Id: If2d0e11594284414953c3dd45475fc7ba3366295
Julia Reynolds [Fri, 31 Jul 2015 13:49:55 +0000 (09:49 -0400)]
Store ringer mode on entering DND mode so it can be restored on exit.
Store the value in Settings now, so it's not lost on reboot.
Bug:
22338093
Change-Id: Icc843ef2bf735c23aabf9ceddd82283d51424220
Paul Jensen [Wed, 5 Aug 2015 10:11:40 +0000 (10:11 +0000)]
am
dbc4edcc: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
* commit '
dbc4edccfced5cb739bae75e8cd15cecc39cf16e':
Fix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Wed, 5 Aug 2015 10:03:47 +0000 (10:03 +0000)]
Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
Yohei Yukawa [Wed, 5 Aug 2015 05:11:11 +0000 (22:11 -0700)]
Reduce log spam for the ease of debugging Bug
22857361.
Now InputMethodManagerService generates the following log
Couldn't create dir.: /data/system/inputmethod
not only when it fails to create the directory but also when
/data/system/inputmethod already exists, which makes it
difficult for us to figure out the root cause of boot failure
on emulator environments (Bug
22857361).
With this CL, IMMS no longer shows the message when the
directory already exists. Basically this is no risk change,
which changes only the condition to show the logging message.
Bug:
22857361
Change-Id: I09aaf501b19845c8309b09b57c23077f1757cd1a
Roozbeh Pournader [Wed, 5 Aug 2015 03:13:27 +0000 (03:13 +0000)]
am
519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev
* commit '
519adb50ebd45b8ecd1a8b8abbb975e35bb42974':
Create a special CONSTRAINED font bucket in frameworks.
Roozbeh Pournader [Wed, 5 Aug 2015 03:04:58 +0000 (03:04 +0000)]
Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev
Svetoslav [Wed, 5 Aug 2015 02:03:40 +0000 (19:03 -0700)]
Fix app ops regressions introduced by the per UID policy change
1. Add a missing statement in the parsing code
2. Notify for all packages on UID ap op policy change
bug:
22957162
Change-Id: Ic2bd5d07ef52be207e66b63ffe45fd8a456eb5a8
xin He [Wed, 5 Aug 2015 01:18:17 +0000 (01:18 +0000)]
am
54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev
* commit '
54cea23479b6c44c5ac40b4f34edf29df311bb91':
Boot loop when SSID has non UTF-8 character in the name
xin He [Wed, 5 Aug 2015 01:10:34 +0000 (01:10 +0000)]
Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev
Jae Seo [Wed, 5 Aug 2015 00:17:53 +0000 (00:17 +0000)]
am
2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev
* commit '
2094a702b33f0bc4e1c22b85a8a6e8bc8988a079':
Unregister the existing callback when MediaProjection stops
Jae Seo [Wed, 5 Aug 2015 00:07:11 +0000 (00:07 +0000)]
Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev
Roozbeh Pournader [Tue, 4 Aug 2015 17:17:08 +0000 (10:17 -0700)]
Create a special CONSTRAINED font bucket in frameworks.
This is a temporary font profile to get razor and razorg (Nexus 7,
2013 version). It's not tested thoroughly, and should not be used for
any other devices.
The CONSTRAINED profile removes Bamum, Lisu, Mandaic, Mongolian, New
Tai Lue, Syriac, Tibetan, and Vai fonts from razor[g] devices, and
switches the CJK fonts to the limited pre-Lollipop fonts.
Bug:
22929087
Change-Id: I58c1693ee45e54b429013029d236617834446811
Jeff Sharkey [Tue, 4 Aug 2015 23:36:03 +0000 (23:36 +0000)]
am
0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev
* commit '
0d6168835a6114a9e346278e4613e9175a907fd3':
Fix moving of apps into legacy ASEC.
Jeff Sharkey [Tue, 4 Aug 2015 23:27:43 +0000 (23:27 +0000)]
Merge "Fix moving of apps into legacy ASEC." into mnc-dev
Filip Gruszczynski [Tue, 4 Aug 2015 23:11:55 +0000 (23:11 +0000)]
am
52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
* commit '
52d3312abeafd988ecb2288896b74ba72c3e70c0':
Make ResourceKey always use non-null configuration override.
Yorke Lee [Tue, 4 Aug 2015 23:07:19 +0000 (16:07 -0700)]
Correctly hide setConnectionService
Bug:
22957023
Change-Id: Ia3bd74f2fcc9f9dd5c9298f4505c18ee652436be
Filip Gruszczynski [Tue, 4 Aug 2015 23:02:19 +0000 (23:02 +0000)]
Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
Phil Burk [Tue, 4 Aug 2015 22:38:55 +0000 (15:38 -0700)]
MidiManager: use ConcurrentHashMap
So that adding and removing device listeners is thread-safe.
Bug:
22909752
Change-Id: I1369ab53c865b54e6e5eb8ea3e8d437fdd1d7197
Signed-off-by: Phil Burk <philburk@google.com>
Filip Gruszczynski [Tue, 4 Aug 2015 21:46:33 +0000 (14:46 -0700)]
Make ResourceKey always use non-null configuration override.
We don't differentiate between null conifguration and
Configuration.EMPTY, but if ResourceKey uses both, it will produce
different hashes and won't be equal. This CL makes ResourceKey always
hold a non null reference to the Configuration object.
We started delivering the configuration overrides in
Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0, which changed behavior from
using always null, to using both null and Conifguration.EMPTY for empty
confgiuration. Now we will switch to using only one value, which is
Configuration.EMPTY.
Bug:
22620824
Change-Id: I090fd90ac21a6b3ebc7f2974a91dd7c861af10d7
Michael Wright [Tue, 4 Aug 2015 22:03:03 +0000 (23:03 +0100)]
Don't dispatch when non-interactive and the display is off.
We generally dispatch while the display is off and we're dozing,
under the assumption that the dozing window is controlling the
display state and wants the events as they come in. Unfortunately,
it's possible that we're dozing but something other than the dozing
component has focus, which leads to dropped and cancelled events.
This was preventing media events from being propogated to the media
session under a number of scenarios, so for now we'll just prevent
dispatching entirely while the display is off and the device is in a
non-interactive state. Going forward we should figure out a better
solution so that doze components can continue to receiving input
events throughout their lifecycle, regardless of the display state.
Bug:
22422588
Change-Id: Ia38bd81245234743e84548841d6478f75a6b8775
Mitchell Wills [Tue, 4 Aug 2015 22:01:35 +0000 (22:01 +0000)]
am
385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit '
385dfd349ff773c499859ee44552995e9c25759c':
Charge apps for wifi tx time while scanning
Mitchell Wills [Tue, 4 Aug 2015 21:55:46 +0000 (21:55 +0000)]
Merge "Charge apps for wifi tx time while scanning" into mnc-dev
Roshan Pius [Tue, 4 Aug 2015 21:49:35 +0000 (21:49 +0000)]
am
78b8d4aa: Mark missed calls as read in calllog restore(2/2)
* commit '
78b8d4aa99ce866caacf291a446837416fa07bd7':
Mark missed calls as read in calllog restore(2/2)
Mitchell Wills [Thu, 30 Jul 2015 00:47:44 +0000 (17:47 -0700)]
Charge apps for wifi tx time while scanning
Bug:
22955562
Change-Id: Ie2c6ab65e7b592272e1cad120ac606fcfd6ea677
Vladislav Kaznacheev [Tue, 4 Aug 2015 17:57:04 +0000 (10:57 -0700)]
Keep OverScroller.SplineOverScroller state consistent.
Currently update() bails out early if it is called
too soon after mStartTime has been set. In this case
mCurrentPosition remains holding an obsolete value
from a previous animation. This causes some strange
behavior (see the referenced bug).
This patch makes sure that mCurrentPosition is
updated every time that mStart is updated.
Bug:
22950559
Change-Id: I07b92f30ebe29856f4e04dc19a4820123713fd7e
John Reck [Tue, 4 Aug 2015 21:14:45 +0000 (21:14 +0000)]
am
906c8dea: am
bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"
* commit '
906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04':
animateNoDamage failed to remove from current frame list
Roshan Pius [Tue, 4 Aug 2015 20:23:03 +0000 (13:23 -0700)]
Mark missed calls as read in calllog restore(2/2)
When missed calls are restored by CalllogBackupAgent using the addCall
API of CallLog provider, we were setting the IS_READ flag to 0 which
resulted in user getting a missed call notifications for all missed
calls after restore.
Adding a new addCall API signature which can specify the value to be put in the
IS_READ field when a call is added to the calllog provider. This will be
used by the CallLogBackupAgent to mark all restored missed calls as
read.
BUG:
22908952
Change-Id: Iee3bea09fbdefef09c7eb6c6c61728cb4d94d9e7
John Reck [Tue, 4 Aug 2015 20:59:57 +0000 (20:59 +0000)]
am
bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"
* commit '
bc04d3acba766c1440e2ab0763aa1352efcf54a8':
animateNoDamage failed to remove from current frame list
Jean-Michel Trivi [Tue, 4 Aug 2015 20:56:03 +0000 (20:56 +0000)]
am
fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev
* commit '
fc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f':
AudioService: check for audio device connection success
John Reck [Tue, 4 Aug 2015 20:53:55 +0000 (20:53 +0000)]
am
2fa3eec0: am
93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
* commit '
2fa3eec0e1807f6a45b71a41624698e8cc949026':
hwui: add extension to support unpack operations in OpenGL ES 2.0