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

121256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
cd8a192537 Merge "Import translations. DO NOT MERGE" 2013-12-17 17:23:33 +00:00
Craig Mautner
3cf234a639 am 4e09cb9b: am 38bcf6dc: am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack." 
* commit '4e09cb9bf6165f68b42549772b74596ceb6198fe':
  Fix to NullPointerException on move back in ActivityStack.
 2013-12-17 16:51:58 +00:00
Craig Mautner
4e09cb9bf6 am 38bcf6dc: am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack." 
* commit '38bcf6dc8784625eb4b68634450c578719346669':
  Fix to NullPointerException on move back in ActivityStack.
 2013-12-17 16:48:46 +00:00
Craig Mautner
38bcf6dc87 am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack." 
* commit '422d7003db8d26b5fa503aa294348d7b53621db1':
  Fix to NullPointerException on move back in ActivityStack.
 2013-12-17 16:45:06 +00:00
Craig Mautner
422d7003db am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack." 
* commit 'f431daa22811fdce9c4ec975d5d33121898b4f9b':
  Fix to NullPointerException on move back in ActivityStack.
 2013-12-17 08:42:31 -08:00
Craig Mautner
f431daa228 Merge "Fix to NullPointerException on move back in ActivityStack." 2013-12-17 16:36:45 +00:00
Daniel 2 Olofsson
9cdf9e52d9 Fix to NullPointerException on move back in ActivityStack. 
In ActivityTask.moveTaskToBackLocked NullPointerException may occur
when moving back with only current Activity in stack. This due to a
condition that may trigger despite a TaskRecord being null and then
attempt accessing the TaskRecord.mOnTopOfHome variable.

TaskRecord task may be set to null when no resumed activity remain.

Resolved by assuring that flag mOnTopOfHome is instead set to false
for current TaskRecord in case where there are no remaining activities
above home.

The above bug has already been corrected in the following commit,
ada62fca51d314cefe2c5da4e007df5b9abf320d, but it does not set the
cottect value to mTopOfHome for the current taks, see below.

Variable mOnTopOfHome will not be set to false in situations where
stack is of size 1 or less and task is null, perhaps from already
having finished current activity.

To avoid current TaskRecord maintaining value mOnTopOfHome to true
after launching Home this variable is set to false.

Impact should not be major due to correction earlier that makes sure
that there is always a TaskRecord.mOnTopOfHome set to true above Home
activity but if not correctly set for current task still gives a
possibility of bad behavior.

Change-Id: Ie86ad99c188aaa05b0de9d58eaa16c42b6fc4341
 2013-12-17 11:35:23 +01:00
Scott Main
c594e9d904 am 1ba5915d: am a759b3d2: am 3fca61f0: am 75b8b3e0: am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs 
* commit '1ba5915dd09675485d55536301fdd7d80a305504':
  add new training course for Interaction and Engagement
 2013-12-17 02:53:54 +00:00
Scott Main
1ba5915dd0 am a759b3d2: am 3fca61f0: am 75b8b3e0: am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs 
* commit 'a759b3d2b4c822a735a3a023be9b484cc05e0b19':
  add new training course for Interaction and Engagement
 2013-12-17 02:50:20 +00:00
Scott Main
a759b3d2b4 am 3fca61f0: am 75b8b3e0: am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs 
* commit '3fca61f073b89136396022d78f444d0a50c1a0d3':
  add new training course for Interaction and Engagement
 2013-12-17 02:47:50 +00:00
Scott Main
3fca61f073 am 75b8b3e0: am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs 
* commit '75b8b3e008589c0a02c27d5baa6b3314a020f505':
  add new training course for Interaction and Engagement
 2013-12-16 18:45:00 -08:00
Alan Viverette
a6c2b5e200 Merge "Fix stroke color in GradientState.initializeWithState()" 2013-12-17 02:13:09 +00:00
Scott Main
75b8b3e008 am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs 
* commit 'ed4b7faa4c17d086233d0b3f86fe315ceee5778e':
  add new training course for Interaction and Engagement
 2013-12-17 02:06:05 +00:00
Scott Main
ed4b7faa4c Merge "add new training course for Interaction and Engagement" into klp-docs 2013-12-17 02:03:40 +00:00
Alan Viverette
083f5518d7 Fix stroke color in GradientState.initializeWithState() 
BUG: 12175674
Change-Id: I084339fd3c31a9b49f5875c9d3bac8f50cd027ca
 2013-12-16 17:55:08 -08:00
Shishir Agrawal
76a0e3bfac Merge "Fixing build breakage due to: c4d41755d73ffe85d179d42a4f0c993b49303145" 2013-12-17 01:47:15 +00:00
Chris Craik
3b3508fe4f Merge "Use vertex assignment instead of manual copy" 2013-12-17 01:37:57 +00:00
Craig Mautner
13f07e5590 am 3b475fef: Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE 
* commit '3b475fefa3b83ce49454936a0be3081753e3e8ad':
  Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
 2013-12-17 01:35:09 +00:00
Shishir Agrawal
375890841d Fixing build breakage due to: c4d41755d73ffe85d179d42a4f0c993b49303145 
Mismatched @param in javadoc.

Change-Id: I9034fac389e89e59c0245203543f52504bfc58d7
 2013-12-16 17:32:56 -08:00
Alan Viverette
0dadf4d030 Merge "Replace auto-create in findViewById() with explicit create() API" 2013-12-17 01:20:22 +00:00
Chris Craik
11a7567d6f Use vertex assignment instead of manual copy 
Change-Id: I36c806e3370abca61e5bf5064f0f1a776a9ce487
 2013-12-16 17:08:15 -08:00
Zhijun He
f353742124 camera2: update java docs for metadata tag spec update 
Below tag spec java docs are updated:
- android.control.mode
- android.control.aeMode
- android.control.afMode
- android.control.awbMode

Bug: 12135317
Change-Id: I83f24c1816dfba1cc042e120fba43c5beb1bd2ae
 2013-12-16 16:56:35 -08:00
Craig Mautner
3b475fefa3 Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE 
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.

Fixes bug 12171535.

Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
 2013-12-16 16:56:19 -08:00
Craig Mautner
0b5bf0019f Merge "Fix incorrect setting of TaskRecord.frontOfTask" 2013-12-17 00:50:20 +00:00
Shishir Agrawal
c4d41755d7 Merge "Adding support for SIM communication from Android over logical channels." 2013-12-17 00:44:40 +00:00
Chris Craik
6d384403d7 Merge "Create private properties on GLCanvas for experimentation with 3d" 2013-12-17 00:11:28 +00:00
Craig Mautner
1aa9d0d3f6 Fix incorrect setting of TaskRecord.frontOfTask 
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.

Fixes bug 12171535.

Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
 2013-12-16 16:06:30 -08:00
Alan Viverette
ee17f0b557 Merge "Refactor display adjustments into their own utils class" 2013-12-16 23:49:35 +00:00
Alan Viverette
add12e56d0 Merge "Don't cast FastScroller adapter to BaseAdapter" 2013-12-16 23:36:49 +00:00
Trevor Johns
1dd7fb187d am b8928b05: am 987ac90d: am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit 'b8928b05932f9592cfeeb9c3cdc96c4066de2d55':
  Docs: Clean up HCE dev guide
 2013-12-16 23:27:57 +00:00
Scott Main
e0e8eb3b92 am 6b4cc772: am 201c7874: am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '6b4cc77248a9e093d5111636680a0c7f39428677':
  fix typo bug: 12174614
 2013-12-16 23:27:51 +00:00
Elliott Hughes
36d10e7994 am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 
* commit '3bfc6e76e627d4122a774488f36fb843bb3694fb':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
 2013-12-16 23:27:39 +00:00
Christopher Tate
f1d58daa2f am 409b7c98: (-s ours) am 4275cae4: am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 
* commit '409b7c98b47cb7ece2760aa53730233f54946e46':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
 2013-12-16 23:27:30 +00:00
Trevor Johns
b8928b0593 am 987ac90d: am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit '987ac90d60b8a0b5ae909ce80b5234c1e5c41068':
  Docs: Clean up HCE dev guide
 2013-12-16 23:05:48 +00:00
Trevor Johns
987ac90d60 am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit 'ed8d921a2e8feae859bb1899356a936eb84fe50f':
  Docs: Clean up HCE dev guide
 2013-12-16 23:02:44 +00:00
Trevor Johns
ed8d921a2e am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit 'eec66178668d22910d3889e62087b3797ebf6dd2':
  Docs: Clean up HCE dev guide
 2013-12-16 14:59:19 -08:00
Chris Craik
ba9b613437 Create private properties on GLCanvas for experimentation with 3d 
Change-Id: I17772f61efce727cb4c1111f4d97f58c741786b8
 2013-12-16 14:57:00 -08:00
Trevor Johns
eec6617866 am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit '73c1681b2f557dfba09a2e1a071dec190dd05e36':
  Docs: Clean up HCE dev guide
 2013-12-16 22:56:38 +00:00
Trevor Johns
73c1681b2f Merge "Docs: Clean up HCE dev guide" into klp-docs 2013-12-16 22:43:48 +00:00
Trevor Johns
7643785aa8 Docs: Clean up HCE dev guide 
Fixed various typos and minor errors in the HCE dev guide. Also added a
note to clarify when CATEGORY_PAYMENT should be used vs CATEGORY_OTHER.

Issue: 11991294

Change-Id: Ifa3f30fe5f35715a4cea3f3565b6f3771f44814a
Signed-off-by: Trevor Johns <trevorjohns@google.com>
 2013-12-16 14:37:26 -08:00
Robert Shih
8a7af570ac Merge "MediaController does not check for cancelled motions in onTouchEvent, causing nested invocations of WindowManagerGlobal.addView. Sample stack trace below." 2013-12-16 22:35:28 +00:00
Alan Viverette
f242659afc Refactor display adjustments into their own utils class 
Change-Id: Iddc413d7841d44b00e06ed1c5a02d54eb60858df
 2013-12-16 13:45:39 -08:00
Igor Murashkin
d83adf00ae Merge "camera2: Add support for embedding images into javadoc" 2013-12-16 21:41:02 +00:00
Scott Main
6b4cc77248 am 201c7874: am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '201c78745d093e0a13420a96647965ee1ccaf68f':
  fix typo bug: 12174614
 2013-12-16 21:38:11 +00:00
Scott Main
201c78745d am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '9a1d3d50cf42db2778dd0e7833608d3293353395':
  fix typo bug: 12174614
 2013-12-16 21:34:58 +00:00
Scott Main
9a1d3d50cf am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '316473915d6f41523c21d7077093c4071ebb4283':
  fix typo bug: 12174614
 2013-12-16 13:31:45 -08:00
Scott Main
316473915d am c53b7aad: fix typo bug: 12174614 
* commit 'c53b7aad505b9d3130ad56fe72989704015858a3':
  fix typo bug: 12174614
 2013-12-16 21:29:18 +00:00
Scott Main
c53b7aad50 fix typo 
bug: 12174614

Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f
 2013-12-16 13:22:08 -08:00
Scott Main
8142898da2 add new training course for Interaction and Engagement 
Change-Id: If0880399c495aa9233cd30aa119b2d48fccd3dd8
 2013-12-16 13:18:24 -08:00
Elliott Hughes
3bfc6e76e6 am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 
* commit 'c0d6028f58b0a55e4956b1bc34ac7e4a98b0f894':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
 2013-12-16 21:07:24 +00:00