Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,118 Commits 3 Branches 0 Tags
285fc7a7cdc16d80dc88766d103bdf570dfd3007
Commit Graph

36144 Commits

Author SHA1 Message Date
Dave Platt
285fc7a7cd Merge "Fix socket descriptor leak from Zygote to child app" 2013-12-13 00:35:41 +00:00
Dave Platt
70ef29b04e Fix socket descriptor leak from Zygote to child app 
Due to an API change in LocalSocket, Zygote must now
manually close the FileDescriptor it created when it
registered a LocalServerSocket.  The LocalSocket.close()
routine will no longer do so.

Bug: 12114500
Change-Id: I8c9fb073924ac33d594bd3bd0eb11d3d1d402506
 2013-12-12 16:27:08 -08:00
Yorke Lee
833a9e58ce Merge "ContactsContract api changes" 2013-12-13 00:11:53 +00:00
Yorke Lee
6b86518c57 Merge "Expose CallLog provider fields as public API" 2013-12-13 00:09:26 +00:00
Andres Morales
ec31555d88 Merge "Adding INfcUnlockSettings and NfcUnlock interface class." 2013-12-12 17:36:40 +00:00
Alan Viverette
774e89f14d Merge "Verify drawables added to ViewOverlay so they can be scheduled" 2013-12-12 02:08:42 +00:00
Alan Viverette
9205407998 Merge "Add caption window color attribute" 2013-12-12 01:20:32 +00:00
Alan Viverette
55d70620d9 Add caption window color attribute 
The WebVTT rendering implementation interprets window color as region
color, since there is no window for non-region captions.

BUG: 12020757
Change-Id: Ie891e1343d718783fc32c712860f886de22558ec
 2013-12-11 15:22:14 -08:00
Marco Nelissen
09cee9d21f am 4f6a1394: am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong" 
* commit '4f6a139493e922f2db5e4ee7bb5364e4f8487322':
  Parse UUID string with Long.parseLong
 2013-12-11 22:42:02 +00:00
Scott Main
2515e6a42f am 5f41b262: am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit '5f41b262a5edb9f2ffb44fff77dc75d5cabec2ba':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-11 22:27:19 +00:00
Marco Nelissen
4f6a139493 am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong" 
* commit 'c680bab3315de2f6af14c1e9fcd3aaf63fa15848':
  Parse UUID string with Long.parseLong
 2013-12-11 22:02:36 +00:00
Scott Main
5f41b262a5 am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit 'aec930b2c6c7e9ad2a7808a1636f7c0fae0164af':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-11 22:02:15 +00:00
Igor Murashkin
f51021c32c Merge "CameraMetadata: updated generated code (with markdown support)" 2013-12-11 21:20:44 +00:00
Alan Viverette
39de9bfa7f Verify drawables added to ViewOverlay so they can be scheduled 
Change-Id: I73d0633966f84876e2093c874acd6813efdbc370
 2013-12-11 13:15:47 -08:00
Marco Nelissen
69b4670730 am ce3bd309: Merge "Parse UUID string with Long.parseLong" 
* commit 'ce3bd309b12e9552c05d5a59a06d7883618c5ca0':
  Parse UUID string with Long.parseLong
 2013-12-11 10:14:56 -08:00
William Luh
3554740951 Merge "Expose new API for querying whether a certificate was user added." 2013-12-11 18:09:45 +00:00
Marco Nelissen
ce3bd309b1 Merge "Parse UUID string with Long.parseLong" 2013-12-11 18:07:50 +00:00
Igor Murashkin
ace5bf0412 CameraMetadata: updated generated code (with markdown support) 
- also updates description of android.blackLevel.lock

Change-Id: I2d10c492bd6779bbb51672da9854252ba18d4327
 2013-12-10 17:36:40 -08:00
Scott Main
f70d7b9ace am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit 'cf5ed42f0b5f2b3787da39d19e9716d6b244b9b5':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-10 17:04:57 -08:00
Scott Main
cf5ed42f0b am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit 'df75bdcc5546112958a6a5834c1a7e060f88bc68':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-11 01:00:46 +00:00
Scott Main
df75bdcc55 rewrite intent guide and add doc with intents supported by platform apps 
Change-Id: Ida7ccbc693e7635198fd368b9560b7843266c7cc
 2013-12-10 15:53:37 -08:00
John Reck
7d2edfc073 Merge "Unbreak display list debug dumping" 2013-12-10 23:33:21 +00:00
John Reck
6304919732 Unbreak display list debug dumping 
Change-Id: I1c6a79f047b29fa60907f6e128cb843a45b88bff
 2013-12-10 15:22:01 -08:00
Michael Wright
4a8e5a05bb Merge "Generate locale-aware gamepad fallbacks for webview" 2013-12-10 22:07:00 +00:00
Narayan Kamath
93f50a1a18 am 98f50502: am 57b94b34: am ca9ba160: am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream." 
* commit '98f50502ea9ed4bd32f2732dc9ded146fafd2005':
  Fix inconsistency in LoggingPrintStream.
 2013-12-10 10:01:32 +00:00
Narayan Kamath
98f50502ea am 57b94b34: am ca9ba160: am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream." 
* commit '57b94b34240aee641c0c2a415d79dbc27cf819af':
  Fix inconsistency in LoggingPrintStream.
 2013-12-10 09:58:14 +00:00
Narayan Kamath
ca9ba160ae am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream." 
* commit 'bea98dc245bad71eb3b5fd831218b3db1f75ee21':
  Fix inconsistency in LoggingPrintStream.
 2013-12-10 01:50:59 -08:00
Narayan Kamath
bea98dc245 Merge "Fix inconsistency in LoggingPrintStream." 2013-12-10 09:30:57 +00:00
Alan Viverette
87079d44f1 Merge "Allow calls to AlertDialog.getButton() before dialog is shown" 2013-12-10 02:44:37 +00:00
Mathieu Chartier
4524cc649a am f2156ad2: am 6a58a2e7: am cb3ee4ed: am 3254260b: Merge "Update Dalvik process state through VMRuntime." 
* commit 'f2156ad2db37ea3733cd090ec05aac3cb6860f2b':
  Update Dalvik process state through VMRuntime.
 2013-12-10 02:34:44 +00:00
Mathieu Chartier
f2156ad2db am 6a58a2e7: am cb3ee4ed: am 3254260b: Merge "Update Dalvik process state through VMRuntime." 
* commit '6a58a2e7e6d39180a130f3bff09aeb7afa6b1e3c':
  Update Dalvik process state through VMRuntime.
 2013-12-10 02:30:45 +00:00
Mathieu Chartier
cb3ee4ed3e am 3254260b: Merge "Update Dalvik process state through VMRuntime." 
* commit '3254260b8b55496468e2b897c76cadd9ecde508d':
  Update Dalvik process state through VMRuntime.
 2013-12-09 18:24:29 -08:00
Alan Viverette
a1e6331942 Allow calls to AlertDialog.getButton() before dialog is shown 
Change-Id: If0737ff53f3e500c2a946a18a753e279882965a2
 2013-12-09 18:20:19 -08:00
Mathieu Chartier
3254260b8b Merge "Update Dalvik process state through VMRuntime." 2013-12-10 02:18:06 +00:00
Alan Viverette
72fafbb4e4 Merge "Prevent reentrance in Dialog.findViewById()" 2013-12-10 02:09:36 +00:00
Yorke Lee
d6a3660d37 Merge "Catch ActivityNotFoundException in quick contacts badge" 2013-12-10 00:23:57 +00:00
John Reck
71c8fa1776 Merge "RenderThread work" 2013-12-10 00:22:33 +00:00
John Reck
cec24ae16e RenderThread work 
Hacky prototype needs a private API to enable

Change-Id: I21e0ddf3cdbd38a4036354b5d6012449e1a34849
 2013-12-09 15:57:09 -08:00
Craig Mautner
bdc748af8c DO NOT MERGE: Eliminate StackBox. 
StackBox is too constraining. Adding size and position to TaskStacks
directly makes stack positioning and management more flexible and
prepares for ActivityView.

Change-Id: I33c6b4e1c23a5a8069fd507c160bcb34e4d287b2
 2013-12-09 15:15:34 -08:00
Amith Yamasani
09e9cdcece DO NOT MERGE : Move some system services to their own sub package. 
(Cherry pick from master)

As a next step they can be moved into separate directories to be
built as separate modules that may or may not be included in a
particular configuration.

Moves AppWidgetService, BackupManagerService, ClipboardService, DevicePolicyMS,
and WallpaperMS.

Change-Id: Idd92871c1828bdde81d85fe99a9c87a22d53169d
 2013-12-09 15:14:41 -08:00
Mike Lockwood
e63f6f7c8d DO NOT MERGE: Remove obsolete "headless" support 
Change-Id: I829fe48e6ebcb819e260646bb19ac6ddfcf07f83
 2013-12-09 15:14:37 -08:00
Alan Viverette
1eb87f2c57 Merge "Unhide accessibility focus and importance getter APIs" 2013-12-09 22:52:11 +00:00
Alan Viverette
c21569aef8 Prevent reentrance in Dialog.findViewById() 
BUG: 12063988
Change-Id: I58117949dde589bcdfcfe88ec90b4a6e8418fe2a
 2013-12-09 14:50:41 -08:00
Andres Morales
38a7ed05f8 Adding INfcUnlockSettings and NfcUnlock interface class. 
Change-Id: Ie55a5d4bb58c2944952fc84cce32d3573a3a1a22
 2013-12-09 14:41:01 -08:00
Lorenzo Colitti
4598ea4e5e am 263c4788: am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress." 
* commit '263c4788dcf45f104f8668fd6621d1a7c39689b9':
  Add address flags and scope to LinkAddress.
 2013-12-09 18:34:44 +00:00
Lorenzo Colitti
30253d7a64 am 2daa0c93: Merge "Add address flags and scope to LinkAddress." 
* commit '2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2':
  Add address flags and scope to LinkAddress.
 2013-12-09 10:28:19 -08:00
Narayan Kamath
b0c7c914eb Fix inconsistency in LoggingPrintStream. 
LoggingPrintStream prints "null" for null strings from
print(String) but throws an NPE from println(String).

Fix this by delegating to the underlying builder (and avoiding
the "fast" path when the input String == null)

bug: https://code.google.com/p/android/issues/detail?id=63380
Change-Id: I89c5c12db6ed5af8037d46f67369b38c5b4cbc9f
 2013-12-09 11:21:26 +00:00
Lorenzo Colitti
2daa0c93c4 Merge "Add address flags and scope to LinkAddress." 2013-12-07 02:43:04 +00:00
Yorke Lee
4fc601a650 Catch ActivityNotFoundException in quick contacts badge 
Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
 2013-12-06 16:35:29 -08:00
Robert Greenwalt
5436b0cfe3 Merge "Fix descriptor leak after accepting connections" 2013-12-06 22:15:49 +00:00