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

183579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Nick Kralevich
98fdff61dd am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates." 
* commit '56fde9e70ef850ca7e3f076e52567f5c75b5e7da':
  SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
 2015-03-03 17:02:22 +00:00
Chris Craik
a6b52198b9 Glop drawBitmaps, drawPatches 
Change-Id: I3f1cd3f47f97d2e0c9b9d153732e26ee0b1c58c2
 2015-03-03 08:58:14 -08:00
Nick Kralevich
56fde9e70e Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates." 2015-03-03 16:55:10 +00:00
Chris Craik
4939e2bf36 Merge "Improve docs for drawable tint and color filters" 2015-03-03 16:46:48 +00:00
Chris Craik
c3c19f826a Merge "Constructor cleanup" 2015-03-03 16:44:34 +00:00
Ed Heyl
fb293aa245 Fix build: Revert "docs: Android 5.1 API Release notes (Lollipop MR1)" 
This reverts commit 50d0953a86af7d6ad2bfaa2ac13d943781f210cb.
 2015-03-02 23:03:09 -08:00
Joe Fernandez
5864f5ed4b am 55902316: am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '559023163d7e9e0aad4846bc0fccfc5c28705ec7':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:48:21 +00:00
Joe Fernandez
559023163d am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '1137ca03be9b9143c472d9adc51ea511cfd68a6b':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:42:39 +00:00
Joe Fernandez
1137ca03be am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:36:02 +00:00
Rich Slogar
36026fecfc am e0a4a469: am a08f2047: am 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22 
* commit 'e0a4a469ef0f97e0586c135aa14bb0cd774fc137':
  docs: support library updates for sdk 22
 2015-03-03 06:32:53 +00:00
Joe Fernandez
246a3a4a79 am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:29:33 +00:00
Rich Slogar
e0a4a469ef am a08f2047: am 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22 
* commit 'a08f2047025b741b6356d2bf0320da57eda7e2bc':
  docs: support library updates for sdk 22
 2015-03-03 06:25:27 +00:00
Joe Fernandez
14fcef3bf0 am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:22:42 +00:00
Rich Slogar
a08f204702 am 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22 
* commit '646c7cd6e81904791b7ecc7ab7750ffe4919371b':
  docs: support library updates for sdk 22
 2015-03-03 06:18:54 +00:00
Joe Fernandez
c4418980a0 am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:15:29 +00:00
Rich Slogar
646c7cd6e8 am a81ed3cd: docs: support library updates for sdk 22 
* commit 'a81ed3cd0f73138832c8386ee66dcbf2b4dce928':
  docs: support library updates for sdk 22
 2015-03-03 06:13:41 +00:00
Joe Fernandez
a31378dc49 Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 2015-03-03 06:11:50 +00:00
Rich Slogar
a81ed3cd0f docs: support library updates for sdk 22 
Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c
 2015-03-02 22:07:07 -08:00
David Stevens
d8812ce390 Add missing paramater to AudioPort jni initialization. 
Change-Id: Ia50a810ca8ceeece52a712e1daf5ffa616951b02
 2015-03-02 21:33:09 -08:00
Rich Slogar
48b426865e am 6717c36f: am 522f5aa5: am ad334de5: am e0ce0f2c: docs: platform revisions 5.1 
* commit '6717c36f4a8e74b13765c57a6aa01d7a2d0a7a6b':
  docs: platform revisions 5.1
 2015-03-03 03:27:05 +00:00
Rich Slogar
6717c36f4a am 522f5aa5: am ad334de5: am e0ce0f2c: docs: platform revisions 5.1 
* commit '522f5aa55ae7dcdf3c011de92939ca901f548a8f':
  docs: platform revisions 5.1
 2015-03-03 03:19:26 +00:00
Rich Slogar
522f5aa55a am ad334de5: am e0ce0f2c: docs: platform revisions 5.1 
* commit 'ad334de54a89ab755ef16aebf47bb16e287782bc':
  docs: platform revisions 5.1
 2015-03-03 03:12:54 +00:00
Rich Slogar
ad334de54a am e0ce0f2c: docs: platform revisions 5.1 
* commit 'e0ce0f2cc28720316902303209f923e699d604f7':
  docs: platform revisions 5.1
 2015-03-03 03:06:48 +00:00
Christopher Tate
c76086cd1c Merge "Use scheduled job rather than periodic alarms for key/value backups" 2015-03-03 02:57:16 +00:00
Rich Slogar
e0ce0f2cc2 docs: platform revisions 5.1 
Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6
 2015-03-02 18:55:44 -08:00
Selim Gurun
e142985278 am 92050710: am 545093df: am 75666e90: Merge "Revert "Add potential future APIs for postmessage"" 
* commit '9205071093eee6c2fb80090210b88c506043da4f':
  Revert "Add potential future APIs for postmessage"
 2015-03-03 02:51:18 +00:00