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

123978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
df47ecaa09 am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT" 
* commit '02a64daefece8ccdc40935c7bc865a8966249c44':
  Tethering: Skip link local addresses when enabling NAT
 2014-02-18 09:13:00 -08:00
Jeff Sharkey
e6d256c50b am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete" 
* commit '234b0b037ee1f8dc50c846279216a8e4d779ff56':
  Fix, MountService now only sends one onShutDownComplete
 2014-02-18 09:12:57 -08:00
Jeff Sharkey
60097a9c5a Merge "Structure device not freed in error case" 2014-02-18 17:12:14 +00:00
Jeff Sharkey
02a64daefe Merge "Tethering: Skip link local addresses when enabling NAT" 2014-02-18 17:11:10 +00:00
Jeff Sharkey
234b0b037e Merge "Fix, MountService now only sends one onShutDownComplete" 2014-02-18 17:10:02 +00:00
John Spurlock
1db8b68237 Content inset hint should consult PolicyControl. 
Missed instance of sysuivis modification from prior commit.

Change-Id: I40af7da262a00a3a379234f42444e49883d76270
 2014-02-18 11:20:57 -05:00
Baligh Uddin
807e0c180b Merge "Import translations. DO NOT MERGE" 2014-02-18 04:30:33 +00:00
Baligh Uddin
ad88948eb2 Import translations. DO NOT MERGE 
Change-Id: I735b0a0de031b145b54b9cf643b7e91bb40c426d
Auto-generated-cl: translation import
 2014-02-17 14:09:14 -08:00
Baligh Uddin
95466feb91 Import translations. DO NOT MERGE 
Change-Id: I15e4f6e6e8ae10556df4031bcc7c5ba6369f8ece
Auto-generated-cl: translation import
 2014-02-17 14:02:21 -08:00
Deepanshu Gupta
c0c4243e85 Merge "Fix layoutlib by avoiding Java7 calls" 2014-02-17 19:28:16 +00:00
Deepanshu Gupta
857ba4af85 Fix layoutlib by avoiding Java7 calls 
This change also fixes a NPE in TypedArray caused by changes in the
framework.

Change-Id: Ie64237c567fa16c35c807db22ce9a4b609ee411d
 2014-02-17 10:43:01 -08:00
Narayan Kamath
b2e0733fe6 am 94b7c749: am 37e6af75: am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts." 
* commit '94b7c749fd0bc5bbd80dbabfd412c2a212584343':
  Move Json{Reader,Writer} test to cts.
 2014-02-17 18:32:44 +00:00
Narayan Kamath
94b7c749fd am 37e6af75: am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts." 
* commit '37e6af75e19b43d7a41c6296b6f722defd0f3172':
  Move Json{Reader,Writer} test to cts.
 2014-02-17 18:29:35 +00:00
Narayan Kamath
37e6af75e1 am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts." 
* commit '92a09fbdebae5362633db281bc155ed1f1145588':
  Move Json{Reader,Writer} test to cts.
 2014-02-17 18:27:13 +00:00
Narayan Kamath
92a09fbdeb am a14d9c31: Merge "Move Json{Reader,Writer} test to cts." 
* commit 'a14d9c318a1d358902a76aff733303c5509bb5fc':
  Move Json{Reader,Writer} test to cts.
 2014-02-17 10:23:56 -08:00
Narayan Kamath
a14d9c318a Merge "Move Json{Reader,Writer} test to cts." 2014-02-17 18:20:34 +00:00
Narayan Kamath
94ccb6bf95 Move Json{Reader,Writer} test to cts. 
These tests aren't really run automatically (or perhaps
even manually) in their present location, and increasing
CTS coverage is never a bad thing.

Change-Id: I81cce1211021011dca551fde62e725e177ca4df0
 2014-02-17 17:51:43 +00:00
Leon Scroggins
73c04711ca Remove call to setIsOpaque (again). 
The call was removed in I1b36b0b0ce7126031eb7b769b563c17dcd4b306a,
since setIsOpaque was deprecated in Skia.

It was accidentally reintroduced in
Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71. This line is redundant
with the lines above it (which call the replacement for setIsOpaque,
setAlphaType).

Change-Id: I6520f796d639721987418ec0ecae82b3674dcbfd
 2014-02-17 10:46:39 -05:00
Narayan Kamath
83e2bd1b26 am ebfcf6cc: am 8c1fc834: am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager." 
* commit 'ebfcf6ccafe43b6538e986151cf55407b7b26979':
  Extended locales in AAPT / AssetManager.
 2014-02-17 11:15:45 +00:00
Narayan Kamath
96cbd05a24 am 8f54f8d6: (-s ours) am 982931c7: am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/country codes." 
* commit '8f54f8d6dcdb6249ccc76e14d61dc4d4e4af029e':
  AssetManager support for 3 letter lang/country codes.
 2014-02-17 11:15:41 +00:00
Narayan Kamath
ebfcf6ccaf am 8c1fc834: am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager." 
* commit '8c1fc83445f8dce7e6d0789feeed8bf98d33bf01':
  Extended locales in AAPT / AssetManager.
 2014-02-17 11:10:11 +00:00
Narayan Kamath
8f54f8d6dc am 982931c7: am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/country codes." 
* commit '982931c72b6cd00c5eea28efc4b086f47f7aca17':
  AssetManager support for 3 letter lang/country codes.
 2014-02-17 11:10:09 +00:00
Narayan Kamath
8c1fc83445 am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager." 
* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6':
  Extended locales in AAPT / AssetManager.
 2014-02-17 11:06:38 +00:00
Narayan Kamath
982931c72b am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/country codes." 
* commit '183e5e038bd844ac415b14f22df5c476732066c8':
  AssetManager support for 3 letter lang/country codes.
 2014-02-17 11:06:31 +00:00
Narayan Kamath
28879bbfe8 am be57fca4: Merge "Extended locales in AAPT / AssetManager." 
* commit 'be57fca41a731217010d9f92554cf48708b06ecf':
  Extended locales in AAPT / AssetManager.
 2014-02-17 03:03:49 -08:00
Narayan Kamath
183e5e038b am 49024bac: Merge "AssetManager support for 3 letter lang/country codes." 
* commit '49024bacf63db39467e7f318c682ad771ec0de22':
  AssetManager support for 3 letter lang/country codes.
 2014-02-17 03:03:46 -08:00
Narayan Kamath
be57fca41a Merge "Extended locales in AAPT / AssetManager." 2014-02-17 11:00:30 +00:00
Narayan Kamath
49024bacf6 Merge "AssetManager support for 3 letter lang/country codes." 2014-02-17 11:00:15 +00:00
Adam Connors
661ec4710b Change API for setProfileOwner to require userId 
Previously the userId of the current process used but it
makes the provisioning process cleaner to be able to pass
it in explicitly.

Change-Id: I670c4cf3638f1340f6d0bf856c3e01045df8c29e
 2014-02-17 10:18:59 +00:00
Zhijun He
870922be23 Camera2: Update java doc for tone.map.curveRed key 
Change-Id: I39df3a14470a1f051ee3eb11866e7205ea7b16b6
 2014-02-15 21:47:51 -08:00
Alan Viverette
fde7865c16 Merge "Remove unnecessary namespace from XML styles/themes" 2014-02-15 01:54:49 +00:00
Alan Viverette
d180ff2b1c Remove unnecessary namespace from XML styles/themes 
Change-Id: If706175f9164f9dcf7e3f9d6bdc7e1f74dba88cf
 2014-02-14 17:50:45 -08:00
Zhijun He
b35badac43 Merge "Camera2: Unhide some capture request templates" 2014-02-15 01:34:57 +00:00
Alan Viverette
22c5abff5f Merge "More Quantum theme boilerplate styles" 2014-02-15 01:13:56 +00:00
Alan Viverette
6148a8f569 More Quantum theme boilerplate styles 
Change-Id: I3411e19cae11e487203420e051b2cf8f4d5ebc65
 2014-02-14 17:05:11 -08:00
John Reck
41342971c2 Merge "Refcounting is hard" 2014-02-15 01:03:02 +00:00
John Reck
a39dd59579 Refcounting is hard 
Bug: 12994941

Change-Id: I6285ff818fc696dbe504174b98a54cb1d00b445c
 2014-02-14 16:59:37 -08:00
Tim Murray
12623f6527 am afb4f8f1: am 8e30d53b: am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter." 
* commit 'afb4f8f144ef70360b70770e17e7d81571e7b296':
  Fix destruction issues relating to AllocationAdapter.
 2014-02-15 00:03:23 +00:00
Christopher Tate
dd615b3c14 Merge "Clarify permission semantics" 2014-02-15 00:01:19 +00:00
Tim Murray
afb4f8f144 am 8e30d53b: am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter." 
* commit '8e30d53b6575a08ec0579fb08c8c4f055598d78b':
  Fix destruction issues relating to AllocationAdapter.
 2014-02-15 00:00:07 +00:00
Tim Murray
8e30d53b65 am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter." 
* commit '4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469':
  Fix destruction issues relating to AllocationAdapter.
 2014-02-14 23:56:57 +00:00
Tim Murray
4870c813fe am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter." 
* commit '7d1a6c5cac16795e5953d2b4d34671e34e907632':
  Fix destruction issues relating to AllocationAdapter.
 2014-02-14 15:53:59 -08:00
Tim Murray
7d1a6c5cac Merge "Fix destruction issues relating to AllocationAdapter." 2014-02-14 23:50:08 +00:00
Tim Murray
6d63c84f44 Fix destruction issues relating to AllocationAdapter. 
bug 12971201

Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
 2014-02-14 15:48:03 -08:00
Christopher Tate
4ba92fc04b Clarify permission semantics 
Bug 12919011

Change-Id: I43a72801ddec04245ac6352eeda4cd0f14aea658
 2014-02-14 15:45:27 -08:00
Ben Gruver
e8ea0d55be am d6739e0f: am 4f416144: am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory" 
* commit 'd6739e0f9dd0a5c633ed3cf484f8c0f723168757':
  Check the return value of listFiles on the ifw directory
 2014-02-14 23:41:30 +00:00
Tim Murray
b542e8e128 am bdb04f02: am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds." 
* commit 'bdb04f025ce34b0240f01961c43d8156a78e27a2':
  Add hidden minor version ID for support lib workarounds.
 2014-02-14 23:41:24 +00:00
Ben Gruver
d6739e0f9d am 4f416144: am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory" 
* commit '4f4161442d1ac6c1a519a06df0e4efeab3072195':
  Check the return value of listFiles on the ifw directory
 2014-02-14 23:22:13 +00:00
Tim Murray
bdb04f025c am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds." 
* commit '17b7ff4af762cd5e9921e9ee360e139956f220a5':
  Add hidden minor version ID for support lib workarounds.
 2014-02-14 23:22:10 +00:00
Dan Stoza
16ec12ae77 Allow disabling layer rotation during screenshots 
Add the ability to ignore layers' transformation matrices during
screenshot capture, which will allow the window manager to capture
unrotated images for recents during the device rotation animation.

Bug: 11805195
Change-Id: I96e65506b198d34724eb3aa84815aae6f6de4935
 2014-02-14 23:10:29 +00:00