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

183659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
9bf06d83ce Import translations. DO NOT MERGE 
Change-Id: Ie73169cd2ccab4f812f7cabbf30d0c0adb570c65
Auto-generated-cl: translation import
 2015-03-04 07:31:55 -08:00
Julia Reynolds
20118f18c1 Allow the device initializer to perform user setup tasks. 
A device initializer is an application that is allowed to run
during user provisioning on device owner devices. During
device provisioning (or, user provisioning of the first user
of the device), a device initializer is granted device owner
permissions. During secondary user provisioning, a device
initializer is granted profile owner permissions. Once
provisioning is complete for a user, all elevated permissions
are removed from the device initializer and the device admin
component of the app is disabled.

Bug: 19230954
Change-Id: Ib6725fb3b09bb21e4198a5dc0b445ccebb40b27e
 2015-03-04 10:25:43 -05:00
Andrei Kapishnikov
d5fe9f60b3 Merge "Replace absolute_uri with absolute_path when HTTP request is forwarded to non-proxy server." 2015-03-04 14:56:31 +00:00
Geoff Mendal
a337b60097 Merge "Import translations. DO NOT MERGE" 2015-03-04 14:55:12 +00:00
Geoff Mendal
a4f2c41ebf Import translations. DO NOT MERGE 
Change-Id: I7b7b245ade1c83878576c5e9e489a4506bfd7538
Auto-generated-cl: translation import
 2015-03-04 06:50:38 -08:00
Geoff Mendal
e901c4262b am 850fd489: (-s ours) am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '850fd489dea0cdf7199cce73027fc95658b0993f':
  Import translations. DO NOT MERGE
 2015-03-04 14:20:25 +00:00
Geoff Mendal
aee73e3d11 am 116b9336: (-s ours) am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE 
* commit '116b9336e2798fdbdea1b98aa4455b485268587b':
  Import translations. DO NOT MERGE
 2015-03-04 14:20:19 +00:00
Geoff Mendal
850fd489de am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'b214417a6e1a7cca5bac961c2b32b72d8baea2dd':
  Import translations. DO NOT MERGE
 2015-03-04 14:14:29 +00:00
Geoff Mendal
116b9336e2 am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE 
* commit 'bb9360e36cea7c2af17992c1b08eedbce707962b':
  Import translations. DO NOT MERGE
 2015-03-04 14:14:24 +00:00
Geoff Mendal
b214417a6e am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3b9e64f3265ad146da1b9f5b523c406acd041f59':
  Import translations. DO NOT MERGE
 2015-03-04 14:08:11 +00:00
Geoff Mendal
bb9360e36c am 63069cc9: (-s ours) Import translations. DO NOT MERGE 
* commit '63069cc985869fe06254e352ea63b361cb0d0917':
  Import translations. DO NOT MERGE
 2015-03-04 14:08:03 +00:00
Geoff Mendal
3b9e64f326 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-04 14:04:04 +00:00
Geoff Mendal
c70510298e Import translations. DO NOT MERGE 
Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7
Auto-generated-cl: translation import
 2015-03-04 06:02:36 -08:00
Geoff Mendal
63069cc985 Import translations. DO NOT MERGE 
Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426
Auto-generated-cl: translation import
 2015-03-04 05:56:33 -08:00
Geoff Mendal
0e8baf3ca6 am 3e938519: (-s ours) am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '3e938519e3b11251c5eae308276a7217fb7c6572':
  Import translations. DO NOT MERGE
 2015-03-04 13:54:41 +00:00
Geoff Mendal
0d6246a660 am 97735297: (-s ours) am 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '97735297307eccc3cedb537fe88a2a76d473f798':
  Import translations. DO NOT MERGE
 2015-03-04 13:54:35 +00:00
Geoff Mendal
3e938519e3 am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '80b9bd854365bf052db9572bcff0fedf74090ff5':
  Import translations. DO NOT MERGE
 2015-03-04 13:47:51 +00:00
Geoff Mendal
9773529730 am 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '42796e97f64ee7ab3dafaf2daf9ebbc2f35030a2':
  Import translations. DO NOT MERGE
 2015-03-04 13:47:46 +00:00
Geoff Mendal
2a90c8f9c9 am 89a2b286: (-s ours) am cba2873e: (-s ours) Import translations. DO NOT MERGE 
* commit '89a2b286ae69858a999d050ac30fdf171dee6d1c':
  Import translations. DO NOT MERGE
 2015-03-04 13:44:24 +00:00
Geoff Mendal
80b9bd8543 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-04 13:42:02 +00:00
Geoff Mendal
42796e97f6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-04 13:41:22 +00:00
Geoff Mendal
89a2b286ae am cba2873e: (-s ours) Import translations. DO NOT MERGE 
* commit 'cba2873edc7cba933484180109204839d68dce87':
  Import translations. DO NOT MERGE
 2015-03-04 13:37:36 +00:00
Geoff Mendal
2df38fd3f5 Import translations. DO NOT MERGE 
Change-Id: Ibbd6d3677d2e146de85bfc7130371546b31cb404
Auto-generated-cl: translation import
 2015-03-04 07:36:32 -06:00
Geoff Mendal
302132c379 Import translations. DO NOT MERGE 
Change-Id: Ifb9b4ef49d9e590dc0e37eb3f91b5ae6ad0ba693
Auto-generated-cl: translation import
 2015-03-04 05:35:11 -08:00
Geoff Mendal
cba2873edc Import translations. DO NOT MERGE 
Change-Id: I253641b732a51a58cbabaa6b487e37f5eda69e2b
Auto-generated-cl: translation import
 2015-03-04 05:29:01 -08:00
Yohann Roussel
9eafb6196d Merge "Fix handling of LOCAL_JACK_ENABLED" 2015-03-04 10:14:35 +00:00
Jim Miller
56b8e8da2b Merge "Change fingerprint behavior in keyguard to dismiss on notification" 2015-03-04 01:34:41 +00:00
Jim Miller
25d7e51a10 Change fingerprint behavior in keyguard to dismiss on notification 
This changes fingerprint to dismiss the notification screen rather
than moving to a trusted state.

Fixes bug 19592835

Change-Id: I5020408df2e8b73a34c264b5ac052251e3a17b8d
 2015-03-03 17:12:09 -08:00
Dianne Hackborn
7d088428f3 Merge "Add new "daily stats" tracking to battery stats." 2015-03-04 00:57:54 +00:00
Andrew Wilson
cfa294ad5e Merge "Fix user switching dialog colors for television." 2015-03-03 23:52:37 +00:00
Dianne Hackborn
d4a8af7b6a Add new "daily stats" tracking to battery stats. 
Currently is only used for tracking the daily charge
and discharge rates.  We keep up to 10 days of data.

Change-Id: I54e29e35ff60d9277da9e476cdab22f4a6d540bf
 2015-03-03 15:38:58 -08:00
George Mount
95d2b1032f Merge "Fix TransitionManager.go not running transition." 2015-03-03 23:37:21 +00:00
George Mount
96e54dcfa4 Fix TransitionManager.go not running transition. 
Bug 19459362

Change-Id: I17595390c9fb289dec8de44447ca490c46570fb4
 2015-03-03 15:28:44 -08:00
Wei Jia
d93fcf4002 MediaPlayer: add setPlaybackRate JAVA API. 
Bug: 19196501
Change-Id: I43daced7d9b53bcaca4e6a8d81ca729b32efc79f
 2015-03-03 14:43:55 -08:00
Craig Mautner
4bd091414a am 5d3f00e3: am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev 
* commit '5d3f00e38b84c107037de1250a6e55d89f84ef77':
  Change ActivityView startActivity state sequence
 2015-03-03 22:25:13 +00:00
Nick Kralevich
1503655007 am 59e06d3a: am 98fdff61: am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates." 
* commit '59e06d3ab479ab04df84b783cb119f032549f492':
  SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
 2015-03-03 22:24:26 +00:00
Chien-Yu Chen
a0e17fafa1 Merge "CameraManager: implement flashlight controls" 2015-03-03 22:24:12 +00:00
Chien-Yu Chen
afa91399fd CameraManager: implement flashlight controls 
Implement the flashlight controls and callbacks and update the
torch mode states.

Bug: 2682206
Change-Id: I59025f34f9ece75dd535166a25c428b8d68c6e4b
 2015-03-03 13:55:07 -08:00
Joe Fernandez
2021ef006c Merge "resolved conflicts for merge of 5864f5ed to master" 2015-03-03 21:10:41 +00:00
Joe Fernandez
2eedc9f96a resolved conflicts for merge of 5864f5ed to master 
Change-Id: I6e413076af7fce85a5300abb2ba529c589dbc7e8
 2015-03-03 13:08:57 -08:00
Craig Mautner
5d3f00e38b am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev 
* commit '358188f5891f5645dbff4fd8cb1a3e7341371f74':
  Change ActivityView startActivity state sequence
 2015-03-03 21:08:45 +00:00
Craig Mautner
358188f589 Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev 2015-03-03 21:03:29 +00:00
Eric Gilmore
00eefca280 Fixing broken link per b/19503824. 
Change-Id: I4140decb254cf9c9f0eadfce1a3897c240d640d9
 2015-03-03 12:10:19 -08:00
Chris Wren
70205fc199 Merge "add null guards around notification listener handlers" 2015-03-03 20:08:08 +00:00
Craig Mautner
b916836e8d Change ActivityView startActivity state sequence 
Problems arise if an activity is started in an ActivityView when the
parent activity is not resumed. In particular the ActivityView can
be brought to the front in front of other activities that have been
started by the parent.

This change checks the state of the parent when the ActivityView is
starting and if it is not resumed, throws an Exception.

This change also removes the queueing up of Intents if the surface
does not exist when startActivity is called. Now, the owner of the
ActivityView is notified when the surface becomes available. If
startActivity is called before that notification an Exception will be
thrown.

Fixes bug 19147472.

Change-Id: I6712cf1929fe65c4238ce7f3feb4e8511ed97244
 2015-03-03 10:15:21 -08:00
Chris Craik
9b98afca76 Merge "Glop DrawPatch support" 2015-03-03 18:12:27 +00:00
David Stevens
9c2fc0bd7a Merge "Add missing paramater to AudioPort jni initialization." 2015-03-03 18:11:07 +00:00
Chris Craik
e2e0073e88 Merge "Glop drawBitmaps, drawPatches" 2015-03-03 18:02:01 +00:00
Chris Craik
0556d90253 Glop DrawPatch support 
Change-Id: Icaa78bdb2cf52c1fc2194ec4016634967d17fb6a
 2015-03-03 09:54:14 -08:00
Nick Kralevich
59e06d3ab4 am 98fdff61: am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates." 
* commit '98fdff61dd651f52d36c0e88dcce8a04568b7cc7':
  SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
 2015-03-03 17:08:50 +00:00