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

34037 Commits

Author SHA1 Message Date
Justin Koh
0be0a5039b am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev 
* commit '7206ac561291298f08809614be95963966a72ca8':
  Add hardware feature describing a watch.
 2014-02-20 23:01:25 +00:00
John Reck
2f2c0e75af Merge "Fix NPE in layer destruction" 2014-02-20 21:24:29 +00:00
John Reck
6b3c4113c4 Fix NPE in layer destruction 
Bug: 13111945
 Fixes an issue where a layer is destroyed after the GLRenderer
 lost its Surface. Instead just check that the context we want is
 current regardless of the active surface

Change-Id: I6537e6232b5c667b218b896ed5ef390fbe956344
 2014-02-20 13:18:42 -08:00
Michael Wright
40c3ddd3a2 Merge "Make deliverInputEvent tracing asynchronous" 2014-02-20 21:07:56 +00:00
Justin Koh
a79ac472d7 am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev 
* commit '744d3473f8a0f9f95e3fdf83670faf6d1551839e':
  Add hardware feature describing a watch.
 2014-02-20 17:41:31 +00:00
Justin Koh
744d3473f8 Merge "Add hardware feature describing a watch." into klp-modular-dev 2014-02-20 17:38:03 +00:00
Narayan Kamath
520a5673fb am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" 
* commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf':
  AArch64: Make AssetAtlasService 64-bit compatible
 2014-02-20 13:02:21 +00:00
Ashok Bhat
4de3f481bc AArch64: Make AssetAtlasService 64-bit compatible 
Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
    AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: Ib4c77c134e3ad5b21732e20cde9a54a0b16bdab1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-20 12:10:24 +00:00
Michael Wright
d2c3adc9c9 Make deliverInputEvent tracing asynchronous 
Change-Id: I640ed4003194d6d4b202680e5c8fffc81749d60f
 2014-02-19 19:11:21 -08:00
John Reck
a13a69f0e5 Merge "Fix layer recycling for GLRenderer" 2014-02-20 02:37:40 +00:00
John Reck
0b2c8df7a6 Fix layer recycling for GLRenderer 
Bug: 13007905

Change-Id: I1589f2bb14429099e391c03d7dfb1650da145f28
 2014-02-19 18:31:08 -08:00
Dan Stoza
b88a904dfe Merge "Allow disabling layer rotation during screenshots" 2014-02-20 00:56:33 +00:00
Alan Viverette
498aa8bb3c Merge "Always redraw background display list when view is redrawn" 2014-02-20 00:47:40 +00:00
Alan Viverette
81547effac Always redraw background display list when view is redrawn 
BUG: 12974357
Change-Id: I358351257e8b099a681e93be8f64e396fdfd6720
 2014-02-19 16:31:03 -08:00
RoboErik
3328868544 Merge "Initial round of MediaSession APIs" 2014-02-20 00:25:10 +00:00
Alan Viverette
ff699570f6 Check item type before re-binding transient state views 
BUG: 12701797
Change-Id: I180613cc342d24b63f80fd699937c7543c38fc20
 2014-02-19 15:25:10 -08:00
RoboErik
01fe661ae5 Initial round of MediaSession APIs 
This is far from complete but puts the basic components in place
for an app to interact with media sessions.

Change-Id: Icfe313f90ad76ae56badbe42b0e43fc5f68db36f
 2014-02-19 13:41:37 -08:00
Ruben Brunk
844aa61960 Merge "camera3: Update whiteLevel tag." 2014-02-19 19:31:57 +00:00
John Reck
5efe5a2d35 Merge "Support HardwareLayers in RenderThread" 2014-02-19 18:58:18 +00:00
John Reck
19b6bcfd83 Support HardwareLayers in RenderThread 
Also has a few HardwareLayer lifecycle fixes

Change-Id: I6308cb05f8f199eed72189ace768013a46815941
 2014-02-19 10:47:19 -08:00
Chris Craik
66d792b663 Merge "Make outline and shadow APIs public" 2014-02-19 18:11:46 +00:00
John Spurlock
7870211955 am 14833719: am 01573b50: am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '14833719e16536ad86943a15ced0d1cb00b65200':
  Fix bad @links in PendingIntent.java
 2014-02-19 14:00:31 +00:00
John Spurlock
01573b5011 am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '469301f7edf2201fdbac217fb0ae49652fa9466c':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:54:13 +00:00
John Spurlock
469301f7ed am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '9dd87081e4bea9cd48db35fa82b3adeda37a34b5':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:51:00 +00:00
John Spurlock
9dd87081e4 am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '998735652d2449e3ccbac7686b71bf40dca06e94':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:47:52 +00:00
John Spurlock
998735652d am ba231fca: Fix bad @links in PendingIntent.java 
* commit 'ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
  Fix bad @links in PendingIntent.java
 2014-02-19 13:44:14 +00:00
Calin Juravle
2f825260f6 am fbd855cb: am 78f522d1: am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit 'fbd855cb60fc3b7e219ead013511a51d17a4482d':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-02-19 11:31:17 +00:00
Calin Juravle
78f522d16e am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit '7a4172d190871c6b17124bf86374304cef727984':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-02-19 11:21:58 +00:00
Jean Chalard
ca7d37bd27 Merge "Fix a crash where user data was not validated." 2014-02-19 03:18:32 +00:00
Dan Sandler
6c306b8e4e Merge "Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS." 2014-02-19 02:26:02 +00:00
Justin Koh
b5731f091c Add hardware feature describing a watch. 
Add hardware feature describing a watch so that hardware can specify that
it is a device that is worn on the body (perhaps the wrist).

Change-Id: I9d4cb7e86067f6ad41b39bcc545222b3b0fbf890
 2014-02-18 18:12:24 -08:00
Fabrice Di Meglio
c39d3d32ab Merge "Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"" 2014-02-19 01:14:46 +00:00
Fabrice Di Meglio
494440be14 Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog" 
This reverts commit 08189afdb0.

Change-Id: Ie8797daca642685ee9a2a541d11a35daa28f0564
 2014-02-19 01:11:21 +00:00
Chris Craik
e9b8817bd7 Make outline and shadow APIs public 
Change-Id: If40dc27b2fdc41c3ed355bc9029474b1344c1a03
 2014-02-18 16:55:45 -08:00
Jay Shrauner
ae58624157 Merge "Prevent SpellChecker from setting invalid range" 2014-02-19 00:24:39 +00:00
Craig Mautner
1bf3795798 am db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev 
* commit 'db0f3e825fb4da01f887c41a877708734b0899e3':
  Allow "opaque" flag to be updated. DO NOT MERGE
 2014-02-18 23:59:42 +00:00
Craig Mautner
db0f3e825f Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev 2014-02-18 23:56:53 +00:00
Andy McFadden
4f0a80d0b8 Allow "opaque" flag to be updated. DO NOT MERGE 
Added a setOpaque() call and a bunch of comments.

Bug 12387406

Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
 2014-02-18 15:54:24 -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
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
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
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
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
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