drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,297 Commits 1 Branch 0 Tags
Commit Graph

204297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Burk
047fe2a721 am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev 
* commit '881cd15519535e493d497fefd857f8fe0236c774':
  MidiManager: use ConcurrentHashMap
 2015-08-05 19:50:46 +00:00
Phil Burk
881cd15519 Merge "MidiManager: use ConcurrentHashMap" into mnc-dev 2015-08-05 19:43:21 +00:00
Vladislav Kaznacheev
af0a618456 am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev 
* commit '8cc00243423e22a36c518cd5ece97b45271ae5e8':
  Keep OverScroller.SplineOverScroller state consistent.
 2015-08-05 19:42:25 +00:00
Vladislav Kaznacheev
8cc0024342 Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev 2015-08-05 19:34:38 +00:00
Yusuke Sato
eb24da62ac am 3383b141: am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" 
* commit '3383b141c3ac4426279e649ebcee535890203c3f':
  Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
 2015-08-05 19:05:17 +00:00
Amit Mahajan
69b55b5f03 Removing tethering overlay for mcc202-mnc05 (VF Greece). 
Bug: 22942869
Change-Id: I1d80ab3a66f7e1cd8e497b0d4236f80b0a126228
 2015-08-05 11:11:56 -07:00
Yohei Yukawa
3c9ec351f1 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.
 2015-08-05 18:07:03 +00:00
Ajay Panicker
7324b1517c am cda6e878: Implement Bluetooth settings factory reset (2/5) 
* commit 'cda6e878cd1b11e10c0b9b4b903b14e11586a963':
  Implement Bluetooth settings factory reset (2/5)
 2015-08-05 18:00:49 +00:00
Yohei Yukawa
db221acce2 Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev 2015-08-05 17:59:23 +00:00
Yusuke Sato
3383b141c3 am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" 
* commit 'a024acb8bab7e0e04f709fc9f927575f448e11db':
  Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
 2015-08-05 17:58:57 +00:00
Andres Morales
c5548c02fe [UserManager] expose method to retrieve credential owner 
Certain operations (like ConfirmCredential) can be invoked
in the context of a profile, in which case the calling code
needs to know under what profile the credential is registered.

Expose a centralized location for this information for Settings
and GateKeeper to consume.

Bug: 22257554
Change-Id: Iffe4f6a254f52d1269b9287edabcf6efa515d9d2
 2015-08-05 10:50:05 -07:00
Yusuke Sato
a024acb8ba Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" 2015-08-05 17:46:18 +00:00
Svetoslav Ganov
69abbe4571 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
 2015-08-05 17:36:02 +00:00
Ajay Panicker
cda6e878cd 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
 2015-08-05 10:35:15 -07:00
Svetoslav Ganov
e72377e17a Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev 2015-08-05 17:22:42 +00:00
Mitchell Wills
701a36d594 am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev 
* commit 'bce3eb22afcd57b7f1bdde26030f8c44bb885a4b':
  Fix incorrect default wifi power draw values
 2015-08-05 17:09:00 +00:00
Rubin Xu
16c4e75e82 am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev 
* commit 'ab868effb7a54bc6a6b2d35412fe466c0adc7f55':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
 2015-08-05 17:00:22 +00:00
Makoto Onuki
fe6964e455 am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev 
* commit '86ee3a57e428b14023bc0bdbd6cb8f8bc206be74':
  READ_SMS allows getLine1Number() [1/3]
 2015-08-05 17:00:16 +00:00
Mitchell Wills
bce3eb22af Merge "Fix incorrect default wifi power draw values" into mnc-dev 2015-08-05 16:59:23 +00:00
Rubin Xu
ab868effb7 Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev 2015-08-05 16:55:50 +00:00
Makoto Onuki
86ee3a57e4 Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev 2015-08-05 16:55:35 +00:00
Rubin Xu
41f2ccb9e4 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
 2015-08-05 17:21:25 +01:00
Niels Egberts
94b5278e65 am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev 
* commit '6bdc4637d7ac1df86e9d745ac483987107a71282':
  NPE occured when trying to parcel voice features.
 2015-08-05 16:04:31 +00:00
Niels Egberts
6bdc4637d7 Merge "NPE occured when trying to parcel voice features." into mnc-dev 2015-08-05 15:57:55 +00:00
Paul McLean
3115960bde Consider channel index masks when calculating channel counts. 
Bug: 22874806
Change-Id: I04b74f5939bb81350d9e37b9629f8bbc242bffe7
 2015-08-05 09:03:51 -06:00
Niels Egberts
54545f7e65 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
 2015-08-05 15:48:26 +01:00
Ian Pedowitz
df27f4b482 am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 
* commit 'df5a66110777554d5b163693ac8395d7c21c328f':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
 2015-08-05 14:43:28 +00:00
Ian Pedowitz
df5a661107 Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 2015-08-05 14:34:13 +00:00
Ian Pedowitz
6cc066df7a Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup"" 
This reverts commit 845d14db9066c3262f270237b52e315aa71508b2.

Bug: 22942480
Bug: 22902898
Change-Id: If2d0e11594284414953c3dd45475fc7ba3366295
 2015-08-05 14:25:15 +00:00
Julia Reynolds
9b11fdb56d 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
 2015-08-05 09:27:23 -04:00
Paul Jensen
66625ff192 am dbc4edcc: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 
* commit 'dbc4edccfced5cb739bae75e8cd15cecc39cf16e':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 10:11:40 +00:00
Paul Jensen
dbc4edccfc Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 2015-08-05 10:03:47 +00:00
Yohei Yukawa
df5af484f8 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
 2015-08-04 22:13:28 -07:00
Roozbeh Pournader
e32d00aae6 am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev 
* commit '519adb50ebd45b8ecd1a8b8abbb975e35bb42974':
  Create a special CONSTRAINED font bucket in frameworks.
 2015-08-05 03:13:27 +00:00
Roozbeh Pournader
519adb50eb Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev 2015-08-05 03:04:58 +00:00
Svetoslav
215b44a1c2 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
 2015-08-04 19:06:41 -07:00
xin He
5e5ac5d8a1 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
 2015-08-05 01:18:17 +00:00
xin He
54cea23479 Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev 2015-08-05 01:10:34 +00:00
Jae Seo
ea0483c4a7 am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev 
* commit '2094a702b33f0bc4e1c22b85a8a6e8bc8988a079':
  Unregister the existing callback when MediaProjection stops
 2015-08-05 00:17:53 +00:00
Jae Seo
2094a702b3 Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev 2015-08-05 00:07:11 +00:00
Roozbeh Pournader
9e21eced5e 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
 2015-08-04 23:36:47 +00:00
Jeff Sharkey
b6117765cd am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev 
* commit '0d6168835a6114a9e346278e4613e9175a907fd3':
  Fix moving of apps into legacy ASEC.
 2015-08-04 23:36:03 +00:00
Jeff Sharkey
0d6168835a Merge "Fix moving of apps into legacy ASEC." into mnc-dev 2015-08-04 23:27:43 +00:00
Filip Gruszczynski
cae230a4e3 am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 
* commit '52d3312abeafd988ecb2288896b74ba72c3e70c0':
  Make ResourceKey always use non-null configuration override.
 2015-08-04 23:11:55 +00:00
Yorke Lee
5346396ba2 Correctly hide setConnectionService 
Bug: 22957023
Change-Id: Ia3bd74f2fcc9f9dd5c9298f4505c18ee652436be
 2015-08-04 16:07:19 -07:00
Filip Gruszczynski
52d3312abe Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 2015-08-04 23:02:19 +00:00
Phil Burk
a95faf78bf 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>
 2015-08-04 15:38:55 -07:00
Filip Gruszczynski
a01f48681c 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
 2015-08-04 15:26:14 -07:00
Michael Wright
2ccf0c8e63 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
 2015-08-04 23:17:48 +01:00
Mitchell Wills
bb4fd9009e am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev 
* commit '385dfd349ff773c499859ee44552995e9c25759c':
  Charge apps for wifi tx time while scanning
 2015-08-04 22:01:35 +00:00