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

128979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
96472bec78 Track package change. 
Change-Id: I6a8123d8e69367fc1ce27bac46c4bcec489d73ba
 2014-04-24 19:05:43 -07: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
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
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
Nick Kralevich
8480384986 Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 2014-04-24 18:18:02 +00:00
Daniel Leung
49cbafad9b Zygote: enable CAP_BLOCK_SUSPEND capability for system server 
Starting from kernel 3.6, it requires processes to have the capability
CAP_BLOCK_SUSPEND to set/unset wake locks. Adds CAP_BLOCK_SUSPEND
to the list of capabilities for system server, so that PowerManager
can set wake locks.

Change-Id: I3246e6f6e6cb8f0bedb1c0417ed07085ee1f3aaa
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
 2014-04-24 19:12:38 +01:00
ztenghui
d2cd53d4e5 Merge "Shoot the rays to the vertices of the incoming polygon." 2014-04-24 18:03:00 +00:00
Adam Powell
10ba27734e Nested scrolling! 
or, "Excuse me, Egon, you said crossing the streams was bad."

Add API for driving a nested scroll from the most deeply nested
applicable scrolling view. The deepest scrolling view dispatches
high-level scrolling events up to cooperative parent views.

Augment ScrollView to support nested scrolling. Next up, more public
framework scrolling views.

Change-Id: I53b5e207fcdece796e08c8592ddb4496b96f600e
 2014-04-24 10:48:52 -07:00
Craig Mautner
5e6e27edb7 Merge "Take screenshots of pausing activity" 2014-04-24 17:44:42 +00:00
Craig Mautner
f6ead5d62e Take screenshots of pausing activity 
Previous CL to optimize out excessive screenshots (ag/379669) was too
effective and didn't take screenshots when going into an activity
that had attribute Window_windowNoDisplay. Adding in the test for
ActivityRecord.noDisplay allows screenshots for this situation.

Fixes bug 13410507.

Change-Id: Ieafebf44b7d1a3ba18115e762fba113f8d1c0252
 2014-04-24 10:39:36 -07:00
Craig Mautner
d2cc56ebb3 resolved conflicts for merge of f8a58208 to master 
Conflicts:
	core/java/android/content/pm/PackageParser.java
	core/res/res/values/attrs_manifest.xml
	core/res/res/values/public.xml

Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2
 2014-04-24 10:27:37 -07:00
ztenghui
589e7b40be Format the xml files for the VectorDrawableTest 
All automatically done by the tool.
No real changes.

Change-Id: I8a98be9441d7cb0b3636c2a850d1e7de9e79394f
 2014-04-24 10:13:07 -07:00
Alexandra Gherghina
80021878a8 Merge "Fix two potential NPEs in DeviceInfo" 2014-04-24 17:11:51 +00:00
Alexandra Gherghina
a4fcb44033 Fix two potential NPEs in DeviceInfo 
Change-Id: Ic4b5b203af25cda9ae65b477c92c1fb5f31ab093
 2014-04-24 17:55:30 +01:00
ztenghui
7940dc57e3 Shoot the rays to the vertices of the incoming polygon. 
bug:13553955

Change-Id: I4825a49e8eaab969c40f2ee4086f7669c9c6fd29
 2014-04-24 09:53:20 -07:00
Jeff Davidson
ee2a1219d3 API tweaks for network score settings. 
Expose "isAppValidScorer" so Settings can call it.

Also rename ACTION_CHANGE_DEFAULT to ACTION_CHANGE_ACTIVE for
consistency with other naming.

Change-Id: I6c2d0099622958f06c2916ca76090e14d5273c86
 2014-04-24 09:33:27 -07:00
Craig Mautner
f8a5820817 am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev 
* commit '03981a4c2e9689197e4d2c916c07ae16207b5276':
  Add activity attribute allowEmbedded
 2014-04-24 16:33:02 +00:00
Craig Mautner
03981a4c2e Merge "Add activity attribute allowEmbedded" into klp-modular-dev 2014-04-24 16:30:14 +00:00
Raph Levien
79cb5505a9 am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '07bed4921a05e717a4b7f10a25e3830e346426b7':
  Fix bug 14276128 Clipping at bottom of TextView
 2014-04-24 16:25:21 +00:00
Raph Levien
07bed4921a am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit 'e4ee0e3193f8e66cabc5352046969041ad4921e5':
  Fix bug 14276128 Clipping at bottom of TextView
 2014-04-24 16:18:08 +00:00