Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,749 Commits 3 Branches 0 Tags
f86a9221a448178f4760192f082f3701ac487a47
Commit Graph

123749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sailesh Nepal
f86a9221a4 Delete Third Party Call APIs 
Change-Id: I6121c53362804a228e0316a1666b5032817530ab
 2014-02-18 17:04:10 -08:00
Adam Lesinski
5441745eff am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup 
* commit '019b1f2668ac17f5e52b6ce32a524d26134a062a':
  Create FEATURE_ constants for print and backup
 2014-02-18 23:03:37 +00:00
Adam Lesinski
019b1f2668 am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup 
* commit '2ea983a567bf536f71dd620e1b215d5aeebce531':
  Create FEATURE_ constants for print and backup
 2014-02-18 23:01:06 +00:00
Adam Lesinski
2ea983a567 am 3d9bcb90: Create FEATURE_ constants for print and backup 
* commit '3d9bcb90ee6c0ffff93642539ae64fb672c7f14a':
  Create FEATURE_ constants for print and backup
 2014-02-18 22:57:37 +00:00
Dianne Hackborn
93b55c1149 Merge "Implement wifi part of issue #12973036: Improve power_profile.xml" 2014-02-18 22:45:17 +00:00
Dianne Hackborn
ca1bf21c51 Implement wifi part of issue #12973036: Improve power_profile.xml 
Add battery stats tracking of wifi state.

Also update when we retrieve the current time to use a more
consistent value across stats tracking.

Change-Id: I6a7c3efd58ff2c8ea86dac141c8f848e7996d63f
 2014-02-18 14:43:14 -08:00
Deepanshu Gupta
f22d01e850 Merge "Fix native methods" 2014-02-18 22:41:14 +00:00
Jeff Sharkey
5b12ed5746 Merge "Lock down MANAGE_DOCUMENTS permission." 2014-02-18 22:40:41 +00:00
Adam Lesinski
3d9bcb90ee Create FEATURE_ constants for print and backup 
Bug:13079822

Change-Id: I6f4b759951d45989e8aad4011fae431ee2ecae0c
 2014-02-18 14:33:00 -08:00
Dan Sandler
2b330dde2c Merge "Allow a user to elect to see private notifications in public." 2014-02-18 22:30:50 +00:00
Jeff Sharkey
89f545a4eb Lock down MANAGE_DOCUMENTS permission. 
MANAGE_DOCUMENTS is a very broad permission, since it allows full
access to all DocumentsProviders.  DocumentsUI should really be the
only app holding this permission; everyone else should rely on Uri
permission grants for access.

Bug: 12958298
Change-Id: I1def48a4ea1814e031fc8513c3cd051d764cd7f8
 2014-02-18 14:26:23 -08:00
Alan Viverette
e082ae6bd6 Merge "Fix sub scroller bounds checking" 2014-02-18 22:08:24 +00:00
Alan Viverette
bb9364279f Fix sub scroller bounds checking 
BUG: 13031919
Change-Id: I6b569b50034fbe70441e11e56706faa9f2acfcbd
 2014-02-18 14:07:35 -08:00
Deepanshu Gupta
98f33350b1 Fix native methods 
Fix native method signatures as changed by the following commits:
56f57ccbd4
76d3a1b8d0

Change-Id: I5db31d3665a5e8c84c107cf84ec3bd5ccfb9a9fe
 2014-02-18 13:08:07 -08:00
Dan Sandler
fd16d56419 Allow a user to elect to see private notifications in public. 
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, if
set and nonzero, will show that user's notifications on the
secure lockscreen (assuming LOCK_SCREEN_ALLOW_NOTIFICATIONS
is also set). Note that this applies only to a particular
user's notifications, so if multiple users' notifications
are shown at once (currently this only applies to the
current user and USER_ALL) only that user's notifications
are affected.

USER_ALL is assumed to always allow private notifications in
public (because they can't be user-specific).

Change-Id: I32bb7939066c4919191e74161ca48ead01a88c7f
 2014-02-18 15:50:44 -05:00
Zhijun He
0ed25174f9 Merge "Camera2: Update java doc for tone.map.curveRed key" 2014-02-18 19:10:37 +00:00
John Spurlock
60450ddbc6 Merge "Content inset hint should consult PolicyControl." 2014-02-18 18:10:34 +00:00
Jessica Hummel
587f43d872 Merge "Change API for setProfileOwner to require userId" 2014-02-18 17:31:31 +00:00
Jeff Sharkey
e62c4a10cb am ab528077: am 37d894a4: am 660a514e: am 60097a9c: Merge "Structure device not freed in error case" 
* commit 'ab5280776f40c473228d3e920771a41289ed7fee':
  Structure device not freed in error case
 2014-02-18 17:26:17 +00:00
Jeff Sharkey
d3b21393bf am fef3dd01: am 41185c84: am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT" 
* commit 'fef3dd01fbad923bf7ff509f4ee95312fd7cb4db':
  Tethering: Skip link local addresses when enabling NAT
 2014-02-18 17:22:23 +00:00
Jeff Sharkey
9a41b24c8f am 392ee12f: am 96190f1c: am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete" 
* commit '392ee12fd57870e1e8f0777d03295b0435babd1f':
  Fix, MountService now only sends one onShutDownComplete
 2014-02-18 17:22:18 +00:00
Jeff Sharkey
ab5280776f am 37d894a4: am 660a514e: am 60097a9c: Merge "Structure device not freed in error case" 
* commit '37d894a42b5744e3e5def5fbfcc641fe3afa2063':
  Structure device not freed in error case
 2014-02-18 17:22:15 +00:00
Jeff Sharkey
37d894a42b am 660a514e: am 60097a9c: Merge "Structure device not freed in error case" 
* commit '660a514e80e0019d8c6632e84bd03491722fc2ab':
  Structure device not freed in error case
 2014-02-18 17:19:38 +00:00
Jeff Sharkey
fef3dd01fb am 41185c84: am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT" 
* commit '41185c844fa7986ff3e5daa4c11288f6bed1463b':
  Tethering: Skip link local addresses when enabling NAT
 2014-02-18 17:18:12 +00:00
Jeff Sharkey
392ee12fd5 am 96190f1c: am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete" 
* commit '96190f1c054e2e34ac741de1d7afb2f6645d218c':
  Fix, MountService now only sends one onShutDownComplete
 2014-02-18 17:18:09 +00:00
Jeff Sharkey
660a514e80 am 60097a9c: Merge "Structure device not freed in error case" 
* commit '60097a9c5a7214cb73d0bc966adef767743f8798':
  Structure device not freed in error case
 2014-02-18 09:16:31 -08:00
Jeff Sharkey
41185c844f am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT" 
* commit 'df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
  Tethering: Skip link local addresses when enabling NAT
 2014-02-18 17:15:44 +00:00
Jeff Sharkey
96190f1c05 am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete" 
* commit 'e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
  Fix, MountService now only sends one onShutDownComplete
 2014-02-18 17:15:39 +00:00
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