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

125504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c889955009 am f22d01e8: Merge "Fix native methods" 
* commit 'f22d01e8504db1ce56cb8a29531f57d488585793':
  Fix native methods
 2014-02-18 14:42:44 -08:00
Jeff Sharkey
a9e14be38a am 5b12ed57: Merge "Lock down MANAGE_DOCUMENTS permission." 
* commit '5b12ed5746080903c8193fd7ae7d9a092747a4b9':
  Lock down MANAGE_DOCUMENTS permission.
 2014-02-18 14:42:41 -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
Dan Sandler
5d7c3cc66c Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS. 
$ adb shell settings put global lock_screen_show_notifications 1

Previously a per-user secure setting
(Settings.Secure.LOCK_SCREEN_ALLOW_NOTIFICATIONS), but this
doesn't really make a lot of sense since this behavior
pertains to areas of the system (keyguard, status bar) that
exist outside of any one user.

This setting now effectively enables notifications on the
secure lockscreen for all users.

Change-Id: I9c5179498dbbba9343184efdedb1587ea862cf96
 2014-02-18 17:35:15 -05:00
Dan Sandler
2db7163cf0 am 2b330dde: Merge "Allow a user to elect to see private notifications in public." 
* commit '2b330dde2c46e6e94687649b8e888f9a2d9855bf':
  Allow a user to elect to see private notifications in public.
 2014-02-18 14:33:51 -08: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
35ed004d67 am e082ae6b: Merge "Fix sub scroller bounds checking" 
* commit 'e082ae6bd6032a1b8f50234b1808287fe7ad124d':
  Fix sub scroller bounds checking
 2014-02-18 14:10: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:
56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334
76d3a1b8d035d27bc80b0f2fc480a903bd001514

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
Ruben Brunk
e60e29554b camera3: Update whiteLevel tag. 
Change-Id: If5b5191b1c494bc6f86d36e1dc47dd38beb10f2b
 2014-02-18 12:17:48 -08:00
Calin Juravle
8fbcc6b4cd Fixed a possible infinite loop in JsonReader#skipValue() 
Bug: https://code.google.com/p/android/issues/detail?id=65846

Change-Id: Idaa0e75fc5612550c4b9ccb9afa5535ea5b189df
 2014-02-18 19:19:15 +00:00
Zhijun He
d424df6cda am 0ed25174: Merge "Camera2: Update java doc for tone.map.curveRed key" 
* commit '0ed25174f98fe473990b1d3298540117d8158e93':
  Camera2: Update java doc for tone.map.curveRed key
 2014-02-18 11:12:27 -08:00
Zhijun He
0ed25174f9 Merge "Camera2: Update java doc for tone.map.curveRed key" 2014-02-18 19:10:37 +00:00
John Spurlock
ba231fcabf Fix bad @links in PendingIntent.java 
Change-Id: I0a0014e17907f5cf16c3536a99e41efa9dafc963
 2014-02-18 13:19:57 -05:00
John Spurlock
7f7594451d am 60450ddb: Merge "Content inset hint should consult PolicyControl." 
* commit '60450ddbc68184b900ff487e85163fb2bb609146':
  Content inset hint should consult PolicyControl.
 2014-02-18 10:13:15 -08:00
John Spurlock
60450ddbc6 Merge "Content inset hint should consult PolicyControl." 2014-02-18 18:10:34 +00:00
Jessica Hummel
b7e4206768 am 587f43d8: Merge "Change API for setProfileOwner to require userId" 
* commit '587f43d8725b11632b5d64a0a56a647207f01668':
  Change API for setProfileOwner to require userId
 2014-02-18 09:34:11 -08:00
Jessica Hummel
587f43d872 Merge "Change API for setProfileOwner to require userId" 2014-02-18 17:31:31 +00:00
Jeff Sharkey
42b7a3677a am e62c4a10: am ab528077: am 37d894a4: am 660a514e: am 60097a9c: Merge "Structure device not freed in error case" 
* commit 'e62c4a10cbcf6946d505470d8cc44c6855c679b3':
  Structure device not freed in error case
 2014-02-18 09:29:48 -08: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
7aa9fa6e73 am d3b21393: am fef3dd01: am 41185c84: am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT" 
* commit 'd3b21393bfdd9adb6d5936f1f6c04b7c410261de':
  Tethering: Skip link local addresses when enabling NAT
 2014-02-18 09:25:24 -08:00
Jeff Sharkey
2be545ae7e am 9a41b24c: am 392ee12f: am 96190f1c: am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete" 
* commit '9a41b24c8f7768d3402256dbd876024f33b1f36b':
  Fix, MountService now only sends one onShutDownComplete
 2014-02-18 09:25:21 -08: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
8b863c5bff am 807e0c18: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '807e0c180b1aaf519ea9ff788508219166cd00cd':
  Import translations. DO NOT MERGE
 2014-02-17 20:33:12 -08:00
Baligh Uddin
8b7705504a am ad88948e: (-s ours) Import translations. DO NOT MERGE 
* commit 'ad88948eb2af0c219147f2835efd33362d1cd0e5':
  Import translations. DO NOT MERGE
 2014-02-17 20:33:10 -08: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
389ecda9f8 am c0c4243e: Merge "Fix layoutlib by avoiding Java7 calls" 
* commit 'c0c4243e8537a2cb6550ca28e161b8fd2d9b9cbe':
  Fix layoutlib by avoiding Java7 calls
 2014-02-17 11:30:23 -08:00