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

128996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruben Brunk
87cfaca476 Merge "camera2: Add DNG creator class." 2014-04-25 01:10:08 +00:00
Selim Gurun
f1e7e4efcc am a6972684: am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'a697268442a68fef255863f0a8a0fa1a610dc340':
  Add a stub to fix master-gpl
 2014-04-25 00:52:37 +00:00
Selim Gurun
a697268442 am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'f7a191731f6c840eed9283652648f267589502c2':
  Add a stub to fix master-gpl
 2014-04-25 00:47:23 +00:00
Craig Mautner
400988b69c am fbb0796e: am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 
* commit 'fbb0796eb3bbbdfeb3218b9495a0f36f4cf4ed19':
  Add test for attribute android:allowEmbedded
 2014-04-25 00:44:56 +00:00
Craig Mautner
fbb0796eb3 am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 
* commit '3359bbe02ca645bae2f495df51e7b4001de6c2b1':
  Add test for attribute android:allowEmbedded
 2014-04-25 00:42:25 +00:00
Selim Gurun
f7a191731f am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'adad989b6a2c736f427526e747dcb89ed9762bab':
  Add a stub to fix master-gpl
 2014-04-25 00:41:59 +00:00
Selim Gurun
adad989b6a Merge "Add a stub to fix master-gpl" 2014-04-25 00:39:10 +00:00
Craig Mautner
3359bbe02c Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 2014-04-25 00:39:06 +00:00
Selim Gurun
85b89bf7a3 Add a stub to fix master-gpl 
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
 2014-04-24 17:31:07 -07:00
Christopher Tate
2ac0462e7b Merge "Send factory reset notification broadcasts at foreground priority" 2014-04-25 00:26:05 +00:00
Elliott Hughes
ccec5f0def resolved conflicts for merge of 02e85744 to master 
Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
 2014-04-24 17:18:10 -07:00
Elliott Hughes
02e857441f am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:59:05 +00:00
Elliott Hughes
5f5ca3bc98 am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '31a1dd2a8f56b439861ee335b55f44323318830c':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:55:09 +00:00
Elliott Hughes
31a1dd2a8f Merge "Use the suggested public API instead of libcore.os." 2014-04-24 23:52:16 +00:00
Andrew Solovay
23af77a3cd am 9a4db311: am 3cb4430b: am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit '9a4db3114b1f3c5c682ee4c9c6f78651c5fc38b8':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:48:57 +00:00
Andrew Solovay
9a4db3114b am 3cb4430b: am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit '3cb4430b071e9e978853f73c0cccd15dc2f37a49':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:45:09 +00:00
Dianne Hackborn
898be168bd Merge "Add support for muliple active development codenames." 2014-04-24 23:43:49 +00:00
Andrew Solovay
3cb4430b07 am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit '27547e6d3a22fb9615594769e460c6a86f2dd44b':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:41:26 +00:00
Andrew Solovay
27547e6d3a am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit 'fdc9e56ff8a1019c353e77f5d4b5f3566d173941':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:37:40 +00:00
Christopher Tate
12e7512690 Merge "Fix native-lib dir assignment & updating" 2014-04-24 23:28:41 +00:00
Selim Gurun
7d5a5cbfd9 Merge "Add ClientCert support" 2014-04-24 23:26:09 +00:00
Winson Chung
67b082e02c Merge "Enabling doc centric recents on phones." 2014-04-24 23:24:40 +00:00
Elliott Hughes
cacbe1b1ef Use the suggested public API instead of libcore.os. 
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
 2014-04-24 16:19:27 -07:00
Ruben Brunk
ab6c9f75ff camera2: Add DNG creator class. 
Change-Id: I11a0e5990adeca6012778f0dc71a421b85cbf53a
 2014-04-24 16:18:47 -07:00
Dianne Hackborn
ffcda10861 Add support for muliple active development codenames. 
The resource API level is also bumped by the number of
active codenames there are.

Change-Id: Ic1bac452d5c13dc3f48040ffa47f54b28abe2ccc
 2014-04-24 16:18:43 -07:00
Christopher Tate
353e39a973 Fix native-lib dir assignment & updating 
The per-package /system/lib/* feature introduced bugs in the
native library path handling during app upgrade installs.  The
crux of the fix is that when recalulating the desired native
library directory, the basis for the calculation needs to be
the scanned APK's location rather than the extant package
settings entry -- because that entry refers to the pre-upgrade
state of the application, not the new state.

Bug 14233983

Change-Id: I76c3249c72ecc055115d430529d386599e52ae42
 2014-04-24 16:08:12 -07:00
Andrew Solovay
fdc9e56ff8 Correcting name of 'Backup & reset' menu. 
Doc is staged at
http://asolovay.mtv.corp.google.com:9000/guide/topics/data/backup.html#Testing

Bug: 14253720
Change-Id: Ib8eb213d8708c02c93c8bc93233db2c828caa925
 2014-04-24 15:59:45 -07:00
Mark Salyzyn
7bdcc0b189 am fc02fcc8: am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues" 
* commit 'fc02fcc8a4ad181c44ca41a99cc86e1d23844d0c':
  jni: android_util_Process 64 bit issues
 2014-04-24 22:19:51 +00:00
Mark Salyzyn
fc02fcc8a4 am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues" 
* commit 'eacaa353e83942d3c59d0db594df0fb6179e0eea':
  jni: android_util_Process 64 bit issues
 2014-04-24 22:17:11 +00:00
ztenghui
7bfe9c450d Merge "Format the xml files for the VectorDrawableTest" 2014-04-24 22:17:02 +00:00
Mark Salyzyn
eacaa353e8 am c717179e: Merge "jni: android_util_Process 64 bit issues" 
* commit 'c717179e4fec346334fe4bb8603184499b746179':
  jni: android_util_Process 64 bit issues
 2014-04-24 22:14:02 +00:00
Christopher Tate
e27ae55d6d Send factory reset notification broadcasts at foreground priority 
Bug 14296706

Change-Id: I07b39e808dbf724f5edd4a11445de3e47c9e862b
 2014-04-24 15:13:13 -07:00
Mark Salyzyn
c717179e4f Merge "jni: android_util_Process 64 bit issues" 2014-04-24 22:10:22 +00:00
Chris Craik
06916dcb05 Merge "Add floats-only drawRoundRect to Canvas" 2014-04-24 21:56:41 +00:00
Selim Gurun
b6aa97e0a0 Add ClientCert support 
Bug: 12983007

This is to add APIs for client certificates. Keep the APIs hidden
until finalizing the design.

Change-Id: I8a1e755e2c509cf821dff7c7df0ddd5270a5f79b
 2014-04-24 14:27:33 -07:00
Chris Craik
4d1c1538e2 Add floats-only drawRoundRect to Canvas 
Change-Id: Ib0033a2d2486a808a44984ec4adf7fef76d9ea17
 2014-04-24 14:23:52 -07:00
Kenny Root
97efc15b32 Merge "PackageManager: remove GET_CERTIFICATES boolean" 2014-04-24 20:51:49 +00:00
Kenny Root
07c79fcc7f PackageManager: remove GET_CERTIFICATES boolean 
This is a really old debugging flag that is not useful and also
dangerous.

Change-Id: I3badb5e361a8fe8458a355bf7d9ab055cb1b57d5
 2014-04-24 13:40:11 -07:00
Jorim Jaggi
fb2b6bc62d Merge "Add text view for double-tap and unlock hint on Keyguard." 2014-04-24 20:34:30 +00:00
Mark Salyzyn
c6a410164e jni: android_util_Process 64 bit issues 
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing

Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
 2014-04-24 13:09:15 -07:00
Jorim Jaggi
e70d31f48d Add text view for double-tap and unlock hint on Keyguard. 
Bug: 14080971
Change-Id: Id6f7344b01bb9666fe6add415ec4a28163315967
 2014-04-24 22:08:30 +02:00
Dianne Hackborn
d80cb24a57 Merge "Fix api." 2014-04-24 19:00:30 +00:00
Dianne Hackborn
b3c90a2bfb Fix api. 
Change-Id: I5a04152a55b277b8609b033a0c35db30458e1ee2
 2014-04-24 11:59:49 -07:00
Jeff Davidson
ede08340e1 Merge "API tweaks for network score settings." 2014-04-24 18:58:56 +00:00
Nick Kralevich
38897b30b7 am 69ee6b0a: am 140dc63f: am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 
* commit '69ee6b0a774346af5e621907a0508c02468b4186':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server
 2014-04-24 18:29:50 +00:00
Dianne Hackborn
806047caca Merge "Start collecting mobile radio activity from the radio." 2014-04-24 18:28:32 +00:00
Nick Kralevich
69ee6b0a77 am 140dc63f: am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 
* commit '140dc63f4f927a8eddddf8d11a142e6975c1c6cf':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server
 2014-04-24 18:25:58 +00:00
Nick Kralevich
140dc63f4f am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 
* commit '8480384986c314bd97b841cbf7f63acb7055ecef':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server
 2014-04-24 18:22:20 +00:00
Dianne Hackborn
2ffa11e4b7 Start collecting mobile radio activity from the radio. 
Hook in to the new radio API to find out when the radio
is active and use that to track its state in batter stats.
We also still have the data being tracked from the kernel's
emulation, and continue to use that if we don't get data from
the radio.

Currently this monitoring is turned off until some issues
in the radio can be fixed that are providing bad data.

Also add a new API to get estimated drain and charge times.

Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
 2014-04-24 11:21:30 -07:00
Adam Powell
46ca506022 Merge "Nested scrolling!" 2014-04-24 18:20:43 +00:00