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

121248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
ed62560f69 Merge "Add Path trimming." 2013-12-11 15:08:59 +00:00
Narayan Kamath
336bf2fb49 am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive." 
* commit 'd21752dff45c7d8856e63026cfddc303a302df14':
  Reimplement ZipFileRO in terms of libziparchive.
 2013-12-11 03:45:58 -08:00
Narayan Kamath
d21752dff4 Merge "Reimplement ZipFileRO in terms of libziparchive." 2013-12-11 11:41:10 +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
Elliott Hughes
5b9437df99 am 4a72b306: Merge "fix possible buffer overrun and memory leak" 
* commit '4a72b3064cecc85c56b8d75bb4a2d9fedbf76ec8':
  fix possible buffer overrun and memory leak
 2013-12-10 17:35:25 -08:00
Elliott Hughes
4a72b3064c Merge "fix possible buffer overrun and memory leak" 2013-12-11 01:29:28 +00:00
Jim Miller
94f71949f7 Merge "Fix memory leak caused by mismatched linkToDeath() in WindowManagerService" 2013-12-11 01:24:35 +00: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
Jim Miller
7267ed1b4b Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 
This fixes a bug where an allocated DeathRecipient in WindowManagerService
was holding a reference to keyguard binder interface after a call to
linkToDeath() without a matchin unlinkToDeath().

It was causing the keyguard side of the binder interface to stick around,
which in tern prevented the keyguard side from releasing its references.

The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.

Fixes bug 11982048

Change-Id: I6959816b819ba953512c53675162195cbf1e0653
 2013-12-10 16:48:13 -08: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
Brian Harris
544604098c Fix incorrect name in eglSwapBuffers log wrapper 
Correctly identify eglSwapBuffers in EGLLogWrapper, which had been
labeled as "eglInitialize".

Change-Id: I67c61e100e2f84400ceebc28712f036e5a055017
 2013-12-10 15:36:46 -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
Craig Mautner
dab959d498 Put new Activity at frontOfTask 
If all previous activities are finishing then a newly added activity
should be marked frontOfTask. Not doing so will cause the wrong
activity to be brought up next.

Fixes bug 12054192.
Fixes bug 11575233.

Change-Id: I663a4da62aa55359c2e970276a6c7cade557634f
 2013-12-10 14:47:57 -08:00
Michael Wright
4a8e5a05bb Merge "Generate locale-aware gamepad fallbacks for webview" 2013-12-10 22:07:00 +00:00
Michael Jurka
48e8f01390 Merge "Fix wallpaper cropping bugs" 2013-12-10 22:06:32 +00:00
Ashok Bhat
656fd04026 AArch64: Use long for pointers in MediaDrm and MediaMuxer 
For storing pointers, long is used in MediaDrm and
MediaMuxer classes, as native pointers can be 64-bit.

Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2013-12-10 18:10:47 +00:00
Yorke Lee
89b366fa95 Reword the "Quick contacts not available" string 
Bug: 12077052
Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
 2013-12-10 09:51:40 -08:00
Joe Fernandez
1290d8e64f am c13b4e25: am 507e635d: am 5f698449: am 3270172f: am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1 
* commit 'c13b4e25310034cc1e8da359edf1ee24d7429e9d':
  docs: Adding Android Build Tools Release Notes 19.0.1
 2013-12-10 16:45:34 +00:00
Joe Fernandez
c13b4e2531 am 507e635d: am 5f698449: am 3270172f: am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1 
* commit '507e635d950a6ca17ebe417b51bfc4ad987cf06b':
  docs: Adding Android Build Tools Release Notes 19.0.1
 2013-12-10 16:39:27 +00:00
Scott Main
c9cd738e10 am e26fe49d: am 113b40cc: am a09588d7: am 99d663aa: Merge "NDK release notes for r9c for review" into klp-ub-dev 
* commit 'e26fe49de16ec148c02460865c26fca50cc8974c':
  NDK release notes for r9c for review
 2013-12-10 16:38:09 +00:00
Joe Fernandez
507e635d95 am 5f698449: am 3270172f: am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1 
* commit '5f69844919e0bc58aa3303865066f85ef79fd136':
  docs: Adding Android Build Tools Release Notes 19.0.1
 2013-12-10 16:36:18 +00:00
Scott Main
e26fe49de1 am 113b40cc: am a09588d7: am 99d663aa: Merge "NDK release notes for r9c for review" into klp-ub-dev 
* commit '113b40cc9dee3559f14facf4f9ad056be578ca08':
  NDK release notes for r9c for review
 2013-12-10 16:35:32 +00:00
Joe Fernandez
5f69844919 am 3270172f: am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1 
* commit '3270172fcabd8d280daa55eb5ba50439b1c88b20':
  docs: Adding Android Build Tools Release Notes 19.0.1
 2013-12-10 08:33:18 -08:00
Scott Main
113b40cc9d am a09588d7: am 99d663aa: Merge "NDK release notes for r9c for review" into klp-ub-dev 
* commit 'a09588d7d6ac2149fe6f17f3da43f2cb8ae51540':
  NDK release notes for r9c for review
 2013-12-10 16:32:27 +00:00
Scott Main
a09588d7d6 am 99d663aa: Merge "NDK release notes for r9c for review" into klp-ub-dev 
* commit '99d663aafa09496bcce1aa46ed928ee01532d0d6':
  NDK release notes for r9c for review
 2013-12-10 08:29:29 -08:00
Joe Fernandez
3270172fca am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1 
* commit '7618a960ab96c282b9905c038a96e2137011ba44':
  docs: Adding Android Build Tools Release Notes 19.0.1
 2013-12-10 16:27:54 +00:00
Scott Main
99d663aafa Merge "NDK release notes for r9c for review" into klp-ub-dev 2013-12-10 16:27:10 +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
57b94b3424 am ca9ba160: am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream." 
* commit 'ca9ba160ae8d0b00919298845aceba8b9dc514d0':
  Fix inconsistency in LoggingPrintStream.
 2013-12-10 09:53:00 +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
Joe Fernandez
e2cd748e5b am eb34e1d7: am ffae30bf: am 9e61ea4e: am 0ff1e37a: am bc06f8ee: Merge "docs: Support Library 19.0.1 Release Notes" into klp-docs 
* commit 'eb34e1d762255f086178cc57ef28521819167716':
  docs: Support Library 19.0.1 Release Notes
 2013-12-10 06:22:44 +00:00
Joe Fernandez
67288d26b1 am c7b3fc84: am 34faa40c: am 1df855a4: am f31d9151: am cdac3b1e: Merge "docs: Platform image version release notes Android 4.4.2" into klp-docs 
* commit 'c7b3fc84defcbcb861af19fe3330b1ff9a5d06b6':
  docs: Platform image version release notes Android 4.4.2
 2013-12-10 06:22:39 +00:00
quddusc
09b68ebeff am 84faf0a9: am ebad00d1: am 50fe9a3a: am 5e95f0e5: am ad7cf3af: Merge "docs: Added training doc for app indexing (aka Calypso)." into klp-docs 
* commit '84faf0a9665cacd3cd03a926df90210f54e9b498':
  docs: Added training doc for app indexing (aka Calypso).
 2013-12-10 06:22:31 +00:00
David Friedman
51501634c7 NDK release notes for r9c for review 
Staged at http://boku.mtv.corp.google.co:9196/tools/sdk/ndk/index.html

Change-Id: Id058d39e10ce64fff2def3dea746ac5e11eff2b4
 2013-12-09 22:22:15 -08:00
Joe Fernandez
eb34e1d762 am ffae30bf: am 9e61ea4e: am 0ff1e37a: am bc06f8ee: Merge "docs: Support Library 19.0.1 Release Notes" into klp-docs 
* commit 'ffae30bfe51b03932a10ce3646fa547392205c1a':
  docs: Support Library 19.0.1 Release Notes
 2013-12-10 06:18:57 +00:00
Joe Fernandez
c7b3fc84de am 34faa40c: am 1df855a4: am f31d9151: am cdac3b1e: Merge "docs: Platform image version release notes Android 4.4.2" into klp-docs 
* commit '34faa40ca28acc0cbd7ca85528e26f175245f4a1':
  docs: Platform image version release notes Android 4.4.2
 2013-12-10 06:18:53 +00:00
quddusc
84faf0a966 am ebad00d1: am 50fe9a3a: am 5e95f0e5: am ad7cf3af: Merge "docs: Added training doc for app indexing (aka Calypso)." into klp-docs 
* commit 'ebad00d185a0962b0ec02e4678c95be0cf7b3fdc':
  docs: Added training doc for app indexing (aka Calypso).
 2013-12-10 06:18:49 +00:00
Joe Fernandez
ffae30bfe5 am 9e61ea4e: am 0ff1e37a: am bc06f8ee: Merge "docs: Support Library 19.0.1 Release Notes" into klp-docs 
* commit '9e61ea4e60122846f52f5a7978c5181152ae2c9e':
  docs: Support Library 19.0.1 Release Notes
 2013-12-10 06:09:12 +00:00
Joe Fernandez
34faa40ca2 am 1df855a4: am f31d9151: am cdac3b1e: Merge "docs: Platform image version release notes Android 4.4.2" into klp-docs 
* commit '1df855a4cd858363b4562febf00134017a5f833e':
  docs: Platform image version release notes Android 4.4.2
 2013-12-10 06:09:08 +00:00
quddusc
ebad00d185 am 50fe9a3a: am 5e95f0e5: am ad7cf3af: Merge "docs: Added training doc for app indexing (aka Calypso)." into klp-docs 
* commit '50fe9a3a3c6a95c2b7fd02170ffa1b170908eeb3':
  docs: Added training doc for app indexing (aka Calypso).
 2013-12-10 06:09:04 +00:00
Joe Fernandez
9e61ea4e60 am 0ff1e37a: am bc06f8ee: Merge "docs: Support Library 19.0.1 Release Notes" into klp-docs 
* commit '0ff1e37a4cfa38b504517246681f94b0ce89322a':
  docs: Support Library 19.0.1 Release Notes
 2013-12-09 22:04:44 -08:00
Joe Fernandez
1df855a4cd am f31d9151: am cdac3b1e: Merge "docs: Platform image version release notes Android 4.4.2" into klp-docs 
* commit 'f31d915113234e35b43af72f35320f4cbad6e465':
  docs: Platform image version release notes Android 4.4.2
 2013-12-09 22:04:40 -08:00
quddusc
50fe9a3a3c am 5e95f0e5: am ad7cf3af: Merge "docs: Added training doc for app indexing (aka Calypso)." into klp-docs 
* commit '5e95f0e55cd9deb450151d990e89ed957b2802a8':
  docs: Added training doc for app indexing (aka Calypso).
 2013-12-09 22:04:35 -08:00
Joe Fernandez
0ff1e37a4c am bc06f8ee: Merge "docs: Support Library 19.0.1 Release Notes" into klp-docs 
* commit 'bc06f8ee369c92e47de18b9d6ae143cf337390e1':
  docs: Support Library 19.0.1 Release Notes
 2013-12-10 06:01:18 +00:00
Joe Fernandez
f31d915113 am cdac3b1e: Merge "docs: Platform image version release notes Android 4.4.2" into klp-docs 
* commit 'cdac3b1e9732b7392c0ab9236757c5e00ef7fce8':
  docs: Platform image version release notes Android 4.4.2
 2013-12-10 06:01:15 +00:00
quddusc
5e95f0e55c am ad7cf3af: Merge "docs: Added training doc for app indexing (aka Calypso)." into klp-docs 
* commit 'ad7cf3afa372ba2479867c1f49aea7566564b5da':
  docs: Added training doc for app indexing (aka Calypso).
 2013-12-10 06:01:10 +00:00