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

202905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e757715be8 am 97b46064: am 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev 
* commit '97b4606422afc43dcf93d0452325297a2ce70abd':
  Boot loop when SSID has non UTF-8 character in the name
 2015-08-05 01:33:43 +00:00
xin He
97b4606422 am 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev 
* commit '3832b13c1fe316be416bacb1f1badc5e67f44b4e':
  Boot loop when SSID has non UTF-8 character in the name
 2015-08-05 01:27:12 +00:00
xin He
3832b13c1f 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:06 +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
9a7040eff6 am 229347ec: am c632313e: am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev 
* commit '229347ec319aedfc76aac4eca9b33e74814807ba':
  Unregister the existing callback when MediaProjection stops
 2015-08-05 00:27:40 +00:00
Jae Seo
229347ec31 am c632313e: am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev 
* commit 'c632313e7294d191fb616bf53b1b9d99ef1ed24a':
  Unregister the existing callback when MediaProjection stops
 2015-08-05 00:21:53 +00:00
Jae Seo
c632313e72 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:14:13 +00:00
Jae Seo
2094a702b3 Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev 2015-08-05 00:07:11 +00:00
Jeff Sharkey
294d1eeb2d am 026457a4: am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev 
* commit '026457a41bf6c5373cba42004c4b5b0f57f54abd':
  Fix moving of apps into legacy ASEC.
 2015-08-04 23:54:37 +00:00
Jeff Sharkey
026457a41b am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev 
* commit '64e26348bcb0f6282b71ff3577521d131f765a56':
  Fix moving of apps into legacy ASEC.
 2015-08-04 23:46:40 +00:00
Jeff Sharkey
64e26348bc 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:38:27 +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
0d6168835a Merge "Fix moving of apps into legacy ASEC." into mnc-dev 2015-08-04 23:27:43 +00:00
Filip Gruszczynski
94858568a1 am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 
* commit 'c3080d7855838bcbe070bddd083a5736687f130b':
  Make ResourceKey always use non-null configuration override.
 2015-08-04 23:27:22 +00:00
Filip Gruszczynski
c3080d7855 am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 
* commit '841d7b75176f4ba086751f12ac57e5420ce501d8':
  Make ResourceKey always use non-null configuration override.
 2015-08-04 23:18:47 +00:00
Filip Gruszczynski
841d7b7517 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:24 +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
Mitchell Wills
d9b729c7c5 am 992ae880: am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev 
* commit '992ae880743a49331ea0ab666f4fe3c8617750db':
  Charge apps for wifi tx time while scanning
 2015-08-04 22:22:25 +00: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
992ae88074 am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev 
* commit 'e8c888c41949c174f8cc244f8d705e675a2f3c30':
  Charge apps for wifi tx time while scanning
 2015-08-04 22:12:30 +00:00
Roshan Pius
9d15a496d1 am 1c53d91e: am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2) 
* commit '1c53d91e815fe281855a1ba5fa3944bcf67eba7c':
  Mark missed calls as read in calllog restore(2/2)
 2015-08-04 22:02:41 +00:00
Mitchell Wills
e8c888c419 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:02:24 +00:00
Roshan Pius
1c53d91e81 am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2) 
* commit '65b84a165239ea8e50b8a7129da7eb1ad4536308':
  Mark missed calls as read in calllog restore(2/2)
 2015-08-04 21:56:58 +00:00
Mitchell Wills
385dfd349f Merge "Charge apps for wifi tx time while scanning" into mnc-dev 2015-08-04 21:55:46 +00:00
Roshan Pius
65b84a1652 am 78b8d4aa: Mark missed calls as read in calllog restore(2/2) 
* commit '78b8d4aa99ce866caacf291a446837416fa07bd7':
  Mark missed calls as read in calllog restore(2/2)
 2015-08-04 21:48:38 +00:00
Mitchell Wills
f901649bd9 Charge apps for wifi tx time while scanning 
Bug: 22955562
Change-Id: Ie2c6ab65e7b592272e1cad120ac606fcfd6ea677
 2015-08-04 14:47:01 -07:00
Vladislav Kaznacheev
84ad7e9ee2 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
 2015-08-04 21:24:59 +00:00
Jean-Michel Trivi
cbda3dc7c5 am 0ca9e2df: am 4032c94d: am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev 
* commit '0ca9e2dffb60781b4bdfa2a4a012f7ee2afa02b8':
  AudioService: check for audio device connection success
 2015-08-04 21:16:49 +00:00
Roshan Pius
78b8d4aa99 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
 2015-08-04 14:10:49 -07:00
Jean-Michel Trivi
0ca9e2dffb am 4032c94d: am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev 
* commit '4032c94d579bc63387f30fd5a3e41083c2bd09fb':
  AudioService: check for audio device connection success
 2015-08-04 21:06:32 +00:00
Svetoslav Ganov
c39730583e am b381d697: am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev 
* commit 'b381d697310c14cef50e0e80bebd15a97b8e9c84':
  Ensure per package and per UID state share same package settings.
 2015-08-04 21:06:13 +00:00
Yohei Yukawa
f4b8c34321 am 9aebdb4c: am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 
* commit '9aebdb4c39bd958f0a568539ea503b2da494802e':
  Revert "Do not forceLayout when window is resized"
 2015-08-04 21:06:06 +00:00
Nick Kralevich
94933e43dc am 2eafb06f: am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 
* commit '2eafb06f5d618015e0bbcd31f8537664914d749d':
  UsbDeviceManager: fix b/21429947 regression (try #2)
 2015-08-04 21:05:57 +00:00
Jean-Michel Trivi
4032c94d57 am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev 
* commit 'fc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f':
  AudioService: check for audio device connection success
 2015-08-04 20:55:57 +00:00
Svetoslav Ganov
b381d69731 am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev 
* commit '073bfb9bec7bc407c50a23a2317852cb0d69599b':
  Ensure per package and per UID state share same package settings.
 2015-08-04 20:54:52 +00:00
Yohei Yukawa
9aebdb4c39 am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 
* commit 'd7d14033af438b88053454e7d73c1689eaa77c35':
  Revert "Do not forceLayout when window is resized"
 2015-08-04 20:54:48 +00:00
Nick Kralevich
2eafb06f5d am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 
* commit 'b2c718146b1be18942bc5d76be68e0d437cbbe8b':
  UsbDeviceManager: fix b/21429947 regression (try #2)
 2015-08-04 20:54:44 +00:00
Jean-Michel Trivi
fc5a4bf0e1 Merge "AudioService: check for audio device connection success" into mnc-dev 2015-08-04 20:45:18 +00:00
Svetoslav Ganov
073bfb9bec 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.
 2015-08-04 20:40:45 +00:00
Yohei Yukawa
d7d14033af am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 
* commit '2d34a8b7181635c0ff0b1f2390d70e3ac6960f00':
  Revert "Do not forceLayout when window is resized"
 2015-08-04 20:40:41 +00:00
Nick Kralevich
b2c718146b am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 
* commit '97b68bbe7180ca15ab10d6f65bbdac6c7e64885b':
  UsbDeviceManager: fix b/21429947 regression (try #2)
 2015-08-04 20:40:35 +00:00
Jae Seo
ac3f8e5534 Unregister the existing callback when MediaProjection stops 
Also removed the unnecessary lock in binderDied.

Bug: 22812934
Change-Id: Ief8856276dbd45a4afa632e51df18bd7d60e6bb1
 2015-08-04 13:30:56 -07:00
Paul Soulos
eca3760f3a am 3adc6671: Merge "Fix doc typo for default wearable notification size." into cw-e-dev 
* commit '3adc6671e965353a946ce77ecdf1ac041b607ccd':
  Fix doc typo for default wearable notification size.
 2015-08-04 20:21:59 +00:00
Svetoslav Ganov
ce68917c84 Merge "Ensure per package and per UID state share same package settings." into mnc-dev 2015-08-04 20:21:44 +00:00
Paul Soulos
3adc6671e9 Merge "Fix doc typo for default wearable notification size." into cw-e-dev 2015-08-04 20:13:41 +00:00