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

122767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Koh
04c6d73fd0 Revert "DO NOT MERGE Fix race condition between binder deaths" 
This reverts commit 8828d86e79424fc1c7b7d1f908e3450879d5cea0.

Change-Id: I211f7b78a286868d8441323ff3c9cf4d7482fb61
 2014-09-26 01:29:17 +00:00
Craig Mautner
8828d86e79 DO NOT MERGE Fix race condition between binder deaths 
If a Binder dies there is a race between activity manager and window
manager to see who can handle the binderDied call first. If the
activity manager wins the race it will remove the activity and task
but leave the windows around. Until the WindowState.binderDied call
is made and all animation is complete the windows will try to access
the task that they were associated with.

This fix removes the windows of an activity when the activity is
removed. It also defers removal of the activity and task until
exiting windows have completed their animation.

Fixes bug 17031518.

Change-Id: Idf52f55c5feb0cad4e3664ef2eae5b7e95bbf490
(cherry picked from commit 5acd163b828d5b26408eb3a7904d750a1570239e)
 2014-09-26 01:01:42 +00:00
Deepanshu Gupta
a6e2f22666 am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '14ffff154f974bb169b3449ad24c508c836c670c':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:47:02 +00:00
Deepanshu Gupta
14ffff154f am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'c8cbff8bdc6c8e61a177eeb1aa728038e0aa86dd':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:35:59 +00:00
Deepanshu Gupta
803a59cae7 Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
 2014-09-25 23:01:38 +00:00
Deepanshu Gupta
c8cbff8bdc Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
 2014-09-25 23:01:08 +00:00
Joe Fernandez
1968b91937 am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 
* commit 'b8a60dada505d79341cfa4cc2b9906d892e8298b':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-24 15:44:50 +00:00
Joe Fernandez
b8a60dada5 Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 2014-09-24 15:39:01 +00:00
Joe Fernandez
57024257e5 docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher 
Change-Id: Iab735d07e705f019828d649e370fe5ef5006f305
 2014-09-24 08:35:03 -07:00
Jeff Vander Stoep
9aaf54eeb6 am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '71b19fc301ff08bd13d394dfa9ef6a3f535b149e':
  Sanity-check paths of files to be restored
 2014-09-23 17:12:38 +00:00
Jeff Vander Stoep
1cf337a222 am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '52824dab7ba48713411ff3a26580b29aa2088242':
  Change permission guard on bindBackupAgent()
 2014-09-23 17:11:58 +00:00
Jeff Vander Stoep
71b19fc301 am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '5ba31e6e9afb34781fe5b927354502d9c6190bc5':
  Sanity-check paths of files to be restored
 2014-09-23 17:02:13 +00:00
Jeff Vander Stoep
52824dab7b am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '1b4f1a794dc90c1ea877af64e8340afe6146584a':
  Change permission guard on bindBackupAgent()
 2014-09-23 17:02:04 +00:00
Jeff Vander Stoep
5ba31e6e9a am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit 'bba797957a83b0ee8869cfa8a9427f6506f74fa4':
  Sanity-check paths of files to be restored
 2014-09-23 16:50:29 +00:00
Jeff Vander Stoep
1b4f1a794d am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '1c2eaa784b2376b674cf438f42342271c8aa79a8':
  Change permission guard on bindBackupAgent()
 2014-09-23 16:50:16 +00:00
Jeff Vander Stoep
bba797957a am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '25c866a8efa148886280b34c0413a1c2c20c247f':
  Sanity-check paths of files to be restored
 2014-09-23 16:34:53 +00:00
Jeff Vander Stoep
25c866a8ef am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit 'e2adb1ff4af09d66096df64461c80d4126ab2692':
  Sanity-check paths of files to be restored
 2014-09-23 16:24:36 +00:00
Jeff Vander Stoep
e2adb1ff4a Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 2014-09-23 16:13:42 +00:00
Jeff Vander Stoep
7bc601d5d7 Sanity-check paths of files to be restored 
(cherry picked from commit 7d51cc701a6735cf455af8479f56c9c0b2109e02)
Bug: 16298491
Change-Id: I0c2d6523c9d152dad4d27d06d3853afd432e5af7
 2014-09-22 23:21:20 +00:00
Ricardo Cervera
4d0f84bb55 am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit '556f23aa1ae01832611e5e3b4059b47e6a7a00fb':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-22 21:37:06 +00:00
Ricardo Cervera
556f23aa1a Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 2014-09-22 21:26:35 +00:00
David Friedman
6bacce4f24 am 8dcf1c32: Fixes two typos, one in each file. 
* commit '8dcf1c32299e2c1c58c053925c572d58f2a74ee9':
  Fixes two typos, one in each file.
 2014-09-22 20:41:17 +00:00
Ricardo Cervera
4af9fa4b23 docs: Fixed Developer Tools image. Bug: 17609483 
Change-Id: I400713dfe5ca54da193dccf15dac117dc4e11ca2
 2014-09-22 19:56:48 +00:00
David Friedman
8dcf1c3229 Fixes two typos, one in each file. 
Change-Id: I5f4a9100d20f8ad50052d63dc106a030ac75b1b0
 2014-09-22 10:24:41 -07:00
Dirk Dougherty
496cfbf7a8 Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-17 15:56:43 -07:00
Robert Ly
9efd9f6070 am fc95c477: docs: edu changes for launch 
* commit 'fc95c477835f86d99cf8c7ce5c1dd098fa42e69c':
  docs: edu changes for launch
 2014-09-17 15:19:15 +00:00
Robert Ly
fc95c47783 docs: edu changes for launch 
Change-Id: Ia9047138bd9972e572b5dd93310339b630a2810d
 2014-09-17 15:13:09 +00:00
Andrew Solovay
6c6664c95d am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 
* commit 'a209406faa1f2b0f1dd7b6e3c5a468729f1c562f':
  Docs: Updated to include new Subscriptions functionality.
 2014-09-17 06:01:09 +00:00
Andrew Solovay
a209406faa Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 2014-09-17 02:21:10 +00:00
Robert Ly
d00b110a3b am e152b793: docs: remove fire and forget language from wear docs 
* commit 'e152b793e5f56ac9d73d0b3e3e191fea6b0ba1e5':
  docs: remove fire and forget language from wear docs
 2014-09-15 19:27:18 +00:00
Robert Ly
e152b793e5 docs: remove fire and forget language from wear docs 
Change-Id: I0a8d83ba0db24f1232d4c729f298c6af04c048b3
 2014-09-15 10:46:23 -07:00
Joe Fernandez
02480cbffa am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs 
* commit '1b12b1dc6f0203913ceb0a88dcf5ef1639fe6515':
  docs: remove bad link in the quick view box for TV Recommendations #2
 2014-09-12 23:42:04 +00:00
Joe Fernandez
1b12b1dc6f Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs 2014-09-12 23:28:54 +00:00
Joe Fernandez
b813f16c47 docs: remove bad link in the quick view box for TV Recommendations #2 
Change-Id: I649d8d735bda2b0c657217bc86c1a29a2d7eddc2
 2014-09-12 16:24:01 -07:00
kmccormick
f530df1c7e am 7392152b: Doc Update: update Cloud Platform link 
* commit '7392152ba21917aff15db89988e1317819b5dd72':
  Doc Update: update Cloud Platform link
 2014-09-12 18:49:18 +00:00
kmccormick
7392152ba2 Doc Update: update Cloud Platform link 
Fix for:

b/17411644

Change-Id: I3893ed25d7b058e2635a56113af74d20284688af
 2014-09-11 18:26:15 -07:00
Jeff Vander Stoep
1c2eaa784b am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '660af7eb1a55e2df7da45aa63ca227141ef86b34':
  Change permission guard on bindBackupAgent()
 2014-09-11 18:58:49 +00:00
Jeff Vander Stoep
660af7eb1a am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '59c1202e10c53587222a98e8c2f6ee3ff0fa1c3f':
  Change permission guard on bindBackupAgent()
 2014-09-11 18:47:53 +00:00
Jeff Vander Stoep
59c1202e10 Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 2014-09-11 18:41:10 +00:00
Jon Larimer
d65ab58705 am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit 'e2b12b1fbc2880bf895fa2a9adcf65de3162c28f':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:33:07 +00:00
Jon Larimer
e2b12b1fbc am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit '61c6ff7b70e2d42b44d5c5f9c3c8e3c67b584a76':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-11 16:23:39 +00:00
Jon Larimer
61c6ff7b70 Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 2014-09-11 16:15:25 +00:00
Jean-Michel Trivi
4fa904aba2 am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit '9513f81e33bc0da445735257c8de11a38f3775fa':
  Do not restore the media button event receiver
 2014-09-11 04:23:21 +00:00
Jean-Michel Trivi
9513f81e33 am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit '24499ba7ff79c8fa2ea9e02256366c43e78f66c0':
  Do not restore the media button event receiver
 2014-09-11 04:16:10 +00:00
Jean-Michel Trivi
24499ba7ff am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit 'e1f07060b8c94cc02309172fb9fb8cd4bd0e35f7':
  Do not restore the media button event receiver
 2014-09-11 00:51:32 +00:00
Ricardo Cervera
4232a59b08 am d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs 
* commit 'd086db30d0f097f34eae0a9a3d443e11cc230d62':
  cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
 2014-09-11 00:06:13 +00:00
Ricardo Cervera
02afa7348b am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 
* commit 'a6c12f0189c92b556fd7c3af3d8466d9b6d828c9':
  docs: Fixed minor bug in downloads class. Bug: 16948533
 2014-09-11 00:06:10 +00:00
Ricardo Cervera
d086db30d0 Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs 2014-09-10 23:57:47 +00:00
Ricardo Cervera
a6c12f0189 Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 2014-09-10 23:57:16 +00:00
Dianne Hackborn
92a5b0d59f Fix issue #16794553: Duplicate ArrayMap entries in Bundle... 
...can lead to launching of un-exported activities

We now validate the array map after unparcelling to make sure there
are no duplicate keys.

And to make up for the performance overhead this introduces, I switched
the parcelling/unparcelling code to write keys as explicit string
objects rather than generic values.  There was no reason to use generic
values since the write method itself only accepts an array map with
String keys.

Change-Id: I57bda9eb79ceaaa9c1b94ad49d9e462b52102149
(cherry picked from commit cee4cdad307071a8ff9a3e2189bf9e6fcc417222)
 2014-09-10 21:55:27 +00:00