OSDN Git Service
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
Yorke Lee [Wed, 5 Aug 2015 22:13:07 +0000 (22:13 +0000)]
Merge "Correctly hide setConnectionService" into mnc-dev
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
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
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
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
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
John Reck [Tue, 4 Aug 2015 20:52:40 +0000 (20:52 +0000)]
Merge "animateNoDamage failed to remove from current frame list"
Jean-Michel Trivi [Tue, 4 Aug 2015 20:45:18 +0000 (20:45 +0000)]
Merge "AudioService: check for audio device connection success" into mnc-dev
John Reck [Tue, 4 Aug 2015 20:39:07 +0000 (20:39 +0000)]
am
93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
* commit '
93c14069588eac2c652263295bc89eb2a2eb3d6b':
hwui: add extension to support unpack operations in OpenGL ES 2.0
Jae Seo [Tue, 4 Aug 2015 18:12:13 +0000 (11:12 -0700)]
Unregister the existing callback when MediaProjection stops
Also removed the unnecessary lock in binderDied.
Bug:
22812934
Change-Id: Ief8856276dbd45a4afa632e51df18bd7d60e6bb1
Svetoslav Ganov [Tue, 4 Aug 2015 20:28:40 +0000 (20:28 +0000)]
am
ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev
* commit '
ce68917c849548d80d9aca14f262d22d9c47c3dc':
Ensure per package and per UID state share same package settings.
Svetoslav Ganov [Tue, 4 Aug 2015 20:21:44 +0000 (20:21 +0000)]
Merge "Ensure per package and per UID state share same package settings." into mnc-dev
Yohei Yukawa [Tue, 4 Aug 2015 20:03:24 +0000 (20:03 +0000)]
am
2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit '
2d34a8b7181635c0ff0b1f2390d70e3ac6960f00':
Revert "Do not forceLayout when window is resized"
John Reck [Tue, 4 Aug 2015 19:55:53 +0000 (19:55 +0000)]
Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
Nick Kralevich [Tue, 4 Aug 2015 19:52:50 +0000 (19:52 +0000)]
am
97b68bbe: Merge "UsbDeviceManager: fix b/
21429947 regression (try #2)" into mnc-dev
* commit '
97b68bbe7180ca15ab10d6f65bbdac6c7e64885b':
UsbDeviceManager: fix b/
21429947 regression (try #2)
Yohei Yukawa [Tue, 4 Aug 2015 19:51:20 +0000 (19:51 +0000)]
Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
Nick Kralevich [Tue, 4 Aug 2015 19:46:06 +0000 (19:46 +0000)]
Merge "UsbDeviceManager: fix b/
21429947 regression (try #2)" into mnc-dev
John Reck [Tue, 4 Aug 2015 19:45:28 +0000 (19:45 +0000)]
am
70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '
70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
Fix crash in kModeProcessNoContext
John Reck [Tue, 4 Aug 2015 19:38:15 +0000 (19:38 +0000)]
Merge "Fix crash in kModeProcessNoContext" into mnc-dev
Deepanshu Gupta [Tue, 4 Aug 2015 18:57:10 +0000 (11:57 -0700)]
Make getInt in BridgeTypedArray accept empty String.
The XML editor already warns about the empty strings in places where an
int value is required. There's no need to show another warning for it in
the rendering panel. Also, the rendering might have also failed when the
empty string is encountered. Try an continue the rendering, because no
rendering state is really bad.
Change-Id: I85106f37e4462f237e85f0b065b4ce8a4bfabf4d
Deepanshu Gupta [Tue, 4 Aug 2015 18:56:44 +0000 (11:56 -0700)]
Fix layout mirroring.
Change-Id: I7db398aa2d11dac1210e84922138f78f0c23bb9b
Julia Reynolds [Tue, 4 Aug 2015 18:35:52 +0000 (18:35 +0000)]
am
35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '
35a1a2095cb6208a7614c35fe19fced6026d3db1':
Include dnd status in bugreports.
Julia Reynolds [Tue, 4 Aug 2015 18:27:13 +0000 (18:27 +0000)]
Merge "Include dnd status in bugreports." into mnc-dev
John Reck [Tue, 4 Aug 2015 18:17:39 +0000 (11:17 -0700)]
Fix crash in kModeProcessNoContext
Bug:
22931143
Change-Id: I9897a28b1edd006aee67ae2343874ad92bbd15a0
Svet Ganov [Tue, 4 Aug 2015 18:13:44 +0000 (11:13 -0700)]
Ensure per package and per UID state share same package settings.
When renaming a package during an OTA we were getting in a state
where the package setting mapped to the package UID was not the
same instance as the one we create for the new package mapped.
This leads to a drift between the permissions state for the package
and that state for the UID, resulting in broken for UID permission
checks as granted permissions were never appearing in the per UID
package setting.
bug:
22928831
Change-Id: Ib0372632ec84a917304561fd94032cd09bb4c12f
Matthew Williams [Tue, 4 Aug 2015 18:04:59 +0000 (18:04 +0000)]
am
d6ef2313: am
0c53f72e: Merge "Fix NPE in JobStore when jobs.xml is empty."
* commit '
d6ef2313ff2ed5ae3fc90548051672f9f29d6650':
Fix NPE in JobStore when jobs.xml is empty.
Matthew Williams [Tue, 4 Aug 2015 17:52:54 +0000 (17:52 +0000)]
am
0c53f72e: Merge "Fix NPE in JobStore when jobs.xml is empty."
* commit '
0c53f72eda9355dc7ceb45c9cf53527258d89399':
Fix NPE in JobStore when jobs.xml is empty.
Matthew Williams [Tue, 4 Aug 2015 17:47:52 +0000 (17:47 +0000)]
am
fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '
fad3c6638168ad65b4f4677a777b8f2dc7e5c9c9':
Remove spurious syncmanager wake-ups
Matthew Williams [Tue, 4 Aug 2015 17:39:51 +0000 (17:39 +0000)]
Merge "Fix NPE in JobStore when jobs.xml is empty."
Nick Kralevich [Thu, 30 Jul 2015 23:29:57 +0000 (16:29 -0700)]
UsbDeviceManager: fix b/
21429947 regression (try #2)
As discussed in b/
21429947 (commit
674019065bceb4150190bfb1aa63cda9de0a8560), MTP must always be
enabled, even if access to the underlying MTP data is disabled.
Otherwise, Android will not enumerate on the USB bus, and won't
receive notifications from the kernel about USB state changes. This
effectively prevents using MTP functionality on user builds, or
on userdebug/eng builds with adb turned off.
Always ensure that MTP is the default driver mode.
Move the DISALLOW_USB_FILE_TRANSFER filtering of mUsbDataUnlocked from
setting time to the time we post the sticky broadcast.
Remove isUsbDataUnlocked(). It essentially duplicates data in the sticky
broadcast.
Bug:
22447614
Bug:
21429947
Change-Id: I9d0d94cadbf6db6281ebd77bfb7162f9d06520c2
Matthew Williams [Tue, 4 Aug 2015 17:35:48 +0000 (17:35 +0000)]
Merge "Remove spurious syncmanager wake-ups" into mnc-dev
Mitchell Wills [Thu, 30 Jul 2015 17:46:05 +0000 (10:46 -0700)]
Fix incorrect default wifi power draw values
Bug:
22848679
Change-Id: Ief4e3e05b051b93efbe30fdc8903cce6765d2ed8
Ye Ouyang [Tue, 4 Aug 2015 15:40:57 +0000 (10:40 -0500)]
animateNoDamage failed to remove from current frame list
runRemainingAnimations is used to animate the available animation handle
which were not yet run, it actually animate those animation handle and
removes from the list by notifyAnimationsRan(). In case if these animation
handles are not removed, it leads to the Fatal Assert of runRemainingAnimations.
Some usecases causes the addition of animation handle when there is
no animators, in these cases this check prevents execution of
notifyAnimationsRan() leads to Fatal Assert crash of runRemainingAnimations.
Allowing the animation to happen irrespective of animators solves the problem.
Change-Id: Ifa72286cdc6ff785fcc999f3b951dd787e7003e9
Ian Pedowitz [Tue, 4 Aug 2015 14:58:24 +0000 (14:58 +0000)]
am
845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '
845d14db9066c3262f270237b52e315aa71508b2':
Revert "Permissions: GET_ACCOUNTS permission cleanup"
Ian Pedowitz [Tue, 4 Aug 2015 14:47:37 +0000 (07:47 -0700)]
Revert "Permissions: GET_ACCOUNTS permission cleanup"
Temporarily revert ag/735253 until b/
22902898 can be resolved with a
proper DMAgent prebuilt drop.
This reverts commit
e7ed827a104ba005b93faa2edb3bc77f72b240ec.
Bug:
22902898
Wale Ogunwale [Tue, 4 Aug 2015 14:46:37 +0000 (14:46 +0000)]
am
b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
* commit '
b2690f3857d207321c8e6dc85a3b529ac52404f2':
Fail silently if a process trys to launch an acitvity for background user
Wale Ogunwale [Tue, 4 Aug 2015 14:38:04 +0000 (14:38 +0000)]
Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
Jason Monk [Tue, 4 Aug 2015 13:51:00 +0000 (13:51 +0000)]
am
55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
* commit '
55dbf2d78e575b6c7b53e06aed17ff7406305a13':
QS: Allow Flashlight Tile to handle reset state
Jason Monk [Tue, 4 Aug 2015 13:43:21 +0000 (13:43 +0000)]
Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
xiaozhengdong [Tue, 4 Aug 2015 08:55:35 +0000 (16:55 +0800)]
hwui: add extension to support unpack operations in OpenGL ES 2.0
OpenGL ES 3.0+ lets us specify the row length for unpack operations
such as glTexSubImage2D(). This allows us to upload a sub-rectangle
of a texture. Also, the GL_EXT_unpack_subimage extension can also
support this feature in OpenGL ES 2.0
Change-Id: Id43c2c55c5eaefbace67087c955f0b4324fb2c35
Signed-off-by: xiaozhengdong <xiaozhengdong@xiaomi.com>
Paul Jensen [Fri, 24 Jul 2015 19:57:11 +0000 (15:57 -0400)]
Fix NOT_RESTRICTED network capability and enforce it.
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
CONNECTIVITY_INTERNAL permission
Bug:
21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
Pavlin Radoslavov [Tue, 4 Aug 2015 04:38:29 +0000 (04:38 +0000)]
am
29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '
29b8c4ab8ac4942e46a9ad4ced795bf06b9f8481':
Reset the pointer to the Bluetooth GATT service
Pavlin Radoslavov [Tue, 4 Aug 2015 00:44:47 +0000 (17:44 -0700)]
Reset the pointer to the Bluetooth GATT service
During error recovery, if the mBluetooth pointer is reset to null,
reset the mBluetoothGatt pointer as well.
Bug:
21756298
Change-Id: I26204ba47dd3c5465bb7de30cfa5dc0f07eee2fd
Adam Lesinski [Tue, 4 Aug 2015 03:10:51 +0000 (03:10 +0000)]
am
59d72c86: Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
* commit '
59d72c86269f4d0c914c233d16a9bf00f0440df8':
BatteryStats: Add debug logging to find source of b/
22716723