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

199476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Egberts
8e4a16b816 am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev 
* commit 'a02bd53edefa6868829602675c068926ef270c63':
  NPE occured when trying to parcel voice features.
 2015-08-05 16:55:26 +00:00
Ian Pedowitz
76b0770558 am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev 
* commit '4d2eec1434f08667999b9cc51e6cf6f7146003e5':
  Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
 2015-08-05 16:55:22 +00:00
Niels Egberts
a02bd53ede 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:48:24 +00:00
Ian Pedowitz
4d2eec1434 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 16:48:18 +00:00
Geoff Mendal
c0d2e7a6fb am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'e229337b34a92f99ed25f92479753e9dfd113a96':
  Import translations. DO NOT MERGE
 2015-08-05 16:28:59 +00:00
Geoff Mendal
e229337b34 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-05 16:19:53 +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
Geoff Mendal
f5262e5215 Import translations. DO NOT MERGE 
Change-Id: I8fe682739483119d031a29310670d8abfc81bedd
Auto-generated-cl: translation import
 2015-08-05 10:48:06 -05: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
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
Geoff Mendal
28739294c1 am 90b69615: (-s ours) Import translations. DO NOT MERGE 
* commit '90b69615706cee73363c3420e2d81a184f9acc07':
  Import translations. DO NOT MERGE
 2015-08-05 14:20:31 +00:00
Geoff Mendal
90b6961570 Import translations. DO NOT MERGE 
Change-Id: I46c802cd1fbcb8dff8893a353b46a4717bfa1a41
Auto-generated-cl: translation import
 2015-08-05 06:53:22 -07:00
Paul Jensen
9529773222 am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
* commit '86e7d135acbdb0055de6a687817d44ac60603c9f':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-08-05 11:24:18 +00:00
Paul Jensen
86e7d135ac resolved conflicts for merge of dbc4edcc to mnc-dr-dev 
Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de
 2015-08-05 07:07:24 -04:00
Paul Jensen
dbc4edccfc Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 2015-08-05 10:03:47 +00:00
Roozbeh Pournader
37b1843417 am 815a6b6b: am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev 
* commit '815a6b6bdf400413057c83fa0ee63db749785d85':
  Create a special CONSTRAINED font bucket in frameworks.
 2015-08-05 03:23:55 +00:00
Roozbeh Pournader
815a6b6bdf 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:16:35 +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
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
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
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
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
Filip Gruszczynski
52d3312abe Merge "Make ResourceKey always use non-null configuration override." into mnc-dev 2015-08-04 23:02:19 +00: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
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
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
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
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