Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,663 Commits 3 Branches 0 Tags
3bb3cd7f789fa79672c36b78330b89d8360fcaef
Commit Graph

34086 Commits

Author SHA1 Message Date
Matt Casey
3bb3cd7f78 am 59270bff: Merge "Add more MediaStore constants for playback intents" 
* commit '59270bffe51de6c9c1ba9e88a6fd5215b717b25c':
  Add more MediaStore constants for playback intents
 2014-02-20 20:59:01 -08:00
Justin Koh
4dc92625b6 am 0be0a503: am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev 
* commit '0be0a5039b60ae4c1c8c0b6a1a2c0e7400d372d5':
  Add hardware feature describing a watch.
 2014-02-20 20:58:27 -08:00
Matt Casey
59270bffe5 Merge "Add more MediaStore constants for playback intents" 2014-02-21 01:18:24 +00:00
Matt Casey
bd7bcf0fba Add more MediaStore constants for playback intents 
Constants are derived from this doc:
https://docs.google.com/a/google.com/document/d/1lmlFcTeefLDRp_bpMrXk3yK9nKxoTVfpcShanpLxiMg/edit#heading=h.b16863tyyjzv

That doc contains the full explanation of these changes.

I'm making this change on behalf of {elmas,pengr} who don't have
android source access but designed this in collaboration with
rharagutchi on the play music team. I'll probably have to route any
significant questions through them.

Bug: 12874557
Change-Id: I85a4bee57a2bde519da0dc6de2cad9d036da225c
 2014-02-20 17:06:09 -08:00
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
33eabdca81 am 2f2c0e75: Merge "Fix NPE in layer destruction" 
* commit '2f2c0e75af6c1a52e067903d0cf9aa4cddd4e37e':
  Fix NPE in layer destruction
 2014-02-20 13:26:56 -08: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
1ed8c7d52a am 40c3ddd3: Merge "Make deliverInputEvent tracing asynchronous" 
* commit '40c3ddd3a2462bc41e5fbf4932373ebd83961a6f':
  Make deliverInputEvent tracing asynchronous
 2014-02-20 13:10:29 -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
0def5a5251 am a13a69f0: Merge "Fix layer recycling for GLRenderer" 
* commit 'a13a69f0e56a4e9998ec4faa78e24c7431b68e72':
  Fix layer recycling for GLRenderer
 2014-02-19 18:40:25 -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
f46b85112d am b88a904d: Merge "Allow disabling layer rotation during screenshots" 
* commit 'b88a904dfe719a8cbb0b9d73cb4637c22a1deed4':
  Allow disabling layer rotation during screenshots
 2014-02-19 16:58:22 -08:00
Dan Stoza
b88a904dfe Merge "Allow disabling layer rotation during screenshots" 2014-02-20 00:56:33 +00:00
Alan Viverette
4ba1e99bcf am 498aa8bb: Merge "Always redraw background display list when view is redrawn" 
* commit '498aa8bb3c51b7c5ba66cb38167263157d13bcc1':
  Always redraw background display list when view is redrawn
 2014-02-19 16:50:40 -08: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
3df1380d14 am 33288685: Merge "Initial round of MediaSession APIs" 
* commit '332886854438809e956fb232b69879e33b5dc2bb':
  Initial round of MediaSession APIs
 2014-02-19 16:27:14 -08:00
RoboErik
3328868544 Merge "Initial round of MediaSession APIs" 2014-02-20 00:25:10 +00:00
Alan Viverette
13138fb588 am ff699570: Check item type before re-binding transient state views 
* commit 'ff699570f62113b4df5b0efd74b9df8b9dbcd1a9':
  Check item type before re-binding transient state views
 2014-02-19 15:32:29 -08: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
1dac456eec am 844aa619: Merge "camera3: Update whiteLevel tag." 
* commit '844aa619607894124ab05c93780dba091394b2a5':
  camera3: Update whiteLevel tag.
 2014-02-19 11:34:05 -08:00
Ruben Brunk
844aa61960 Merge "camera3: Update whiteLevel tag." 2014-02-19 19:31:57 +00:00
John Reck
e022b60d96 am 5efe5a2d: Merge "Support HardwareLayers in RenderThread" 
* commit '5efe5a2d35604595913c9e372c904b85c32e71c8':
  Support HardwareLayers in RenderThread
 2014-02-19 11:12:50 -08:00
Chris Craik
0f750eb306 am 66d792b6: Merge "Make outline and shadow APIs public" 
* commit '66d792b6631a8dfd0dd0b7abc75077760fa083cc':
  Make outline and shadow APIs public
 2014-02-19 11:12:43 -08: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
176b211554 am 78702119: am 14833719: am 01573b50: am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java 
* commit '7870211955631c8e1b3c1932c7c8a46b5c1c9fd5':
  Fix bad @links in PendingIntent.java
 2014-02-19 06:07:20 -08: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
d48a4b8da8 am 2f825260: am fbd855cb: am 78f522d1: am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit '2f825260f69c47cd61f2e85f4c2fd7869bc1f212':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-02-19 03:34:34 -08: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
a506f6f4e1 am ca7d37bd: Merge "Fix a crash where user data was not validated." 
* commit 'ca7d37bd270addab2fb764c86b56792bc9349730':
  Fix a crash where user data was not validated.
 2014-02-18 20:14:38 -08:00
Jean Chalard
ca7d37bd27 Merge "Fix a crash where user data was not validated." 2014-02-19 03:18:32 +00:00
Dan Sandler
e515b32dcd am 6c306b8e: Merge "Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS." 
* commit '6c306b8e4e1cd1bf303c58676148378116b2e396':
  Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
 2014-02-18 18:28:31 -08: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
b8b54bc69c am c39d3d32: Merge "Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"" 
* commit 'c39d3d32abd70dd48ba58b6fb28b12bb61e375d9':
  Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"
 2014-02-18 17:19:09 -08:00