OSDN Git Service
Dirk Dougherty [Sat, 27 Sep 2014 05:14:05 +0000 (05:14 +0000)]
am
6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs
* commit '
6373718b883dd945c17987ac64925c0fdc30674d':
Doc change: Add new index page for games stories.
Dirk Dougherty [Sat, 27 Sep 2014 03:16:52 +0000 (03:16 +0000)]
Merge "Doc change: Add new index page for games stories." into klp-modular-docs
Dirk Dougherty [Fri, 26 Sep 2014 21:52:48 +0000 (14:52 -0700)]
Doc change: Add new index page for games stories.
Change-Id: Icd9de0715c8a77333fd73a46f31c3ad81d0b951b
Dirk Dougherty [Sat, 27 Sep 2014 00:22:41 +0000 (00:22 +0000)]
am
afbe165a: Doc change: Add IAB v2 deprecation notice.
* commit '
afbe165aecb00b74f8228314cc60b28af089e8e3':
Doc change: Add IAB v2 deprecation notice.
Kevin Ma [Fri, 26 Sep 2014 18:52:24 +0000 (18:52 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev
Kevin Ma [Fri, 26 Sep 2014 18:30:37 +0000 (18:30 +0000)]
Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
This reverts commit
04c6d73fd0e4472505275688ef8497bc6697647c.
Bug:
17286687
Change-Id: Ic11d1e35198accb5a05cd419f5a522bc39fc789b
Dirk Dougherty [Wed, 17 Sep 2014 22:20:38 +0000 (15:20 -0700)]
Doc change: Add IAB v2 deprecation notice.
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1
Conflicts:
docs/html/google/play/billing/index.jd
Deepanshu Gupta [Fri, 26 Sep 2014 06:05:03 +0000 (06:05 +0000)]
am
8c61344d: am
528b5862: am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
8c61344d89ab3b1f02228b3da10c8377c41960ff':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:53:47 +0000 (05:53 +0000)]
am
528b5862: am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
528b58623feee609055a31e58bf5e1ea3658bf40':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:43:38 +0000 (05:43 +0000)]
am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
941a8f03599b91f752c455dceef993887c4b9b20':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:43:32 +0000 (05:43 +0000)]
am
ab5971d8: am
1489862e: am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ab5971d825d9d59f06b49e1f1e66a24df417124e':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:34:34 +0000 (05:34 +0000)]
am
1489862e: am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
1489862ecee4f298de6a7b27789dda08ff4aa4cf':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:32:09 +0000 (05:32 +0000)]
am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
0c4893ece99418842538db496bb8d53b767b335b':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:24:06 +0000 (05:24 +0000)]
am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
48d0fd99f0a25829f191e7f7ed35cf8d0a2b5902':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:20:48 +0000 (05:20 +0000)]
am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
2889942f4ee7762cdbd097cf3ceea16444f8841a':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:13:09 +0000 (05:13 +0000)]
am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ee41b79c5735bb3399108bb62de1145fffff3904':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:09:54 +0000 (05:09 +0000)]
am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
bfeeee8e4a9cf4bf32067c2ca5807cd612564a99':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:02:22 +0000 (05:02 +0000)]
am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ecbe6045911ac7c05a1e999b966577ef7b1bdc18':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:57:59 +0000 (04:57 +0000)]
am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
7d23e405bd3a18f871bcf9856b5a9bcc0ccb1236':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:49:31 +0000 (04:49 +0000)]
am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
6950920f19980a2416e156d2337b93e386b3f8be':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:40:53 +0000 (04:40 +0000)]
am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
f103317499bdb12cbcac1754899756d22acde986':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:37:23 +0000 (04:37 +0000)]
am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
1fce990ce9098afe96e75ec1583c771826c50637':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:22:39 +0000 (04:22 +0000)]
am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
04861ed488f5aaa62acbaf903e359ea9edd8e9f9':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 03:00:29 +0000 (03:00 +0000)]
am
83951615: am
467aea17: am
a39b3b25: (-s ours) am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
83951615f564521d542da00d3bf60a372787aced':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 02:49:04 +0000 (02:49 +0000)]
am
467aea17: am
a39b3b25: (-s ours) am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
467aea1722f5cd73d0874502447d947bccd13c99':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 02:07:42 +0000 (02:07 +0000)]
am
a39b3b25: (-s ours) am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
a39b3b25b947d6c1ab49c08fdcd6f5149f037b20':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Justin Koh [Fri, 26 Sep 2014 01:29:17 +0000 (01:29 +0000)]
Revert "DO NOT MERGE Fix race condition between binder deaths"
This reverts commit
8828d86e79424fc1c7b7d1f908e3450879d5cea0.
Change-Id: I211f7b78a286868d8441323ff3c9cf4d7482fb61
Craig Mautner [Thu, 14 Aug 2014 23:08:26 +0000 (16:08 -0700)]
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)
Deepanshu Gupta [Fri, 26 Sep 2014 00:59:08 +0000 (00:59 +0000)]
am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
91043364b95fe58225437e2220d497ef6e33edf6':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:58:23 +0000 (00:58 +0000)]
am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
93b185e39c5e6a90d413ffa5a2eea740feb7364b':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:48:26 +0000 (00:48 +0000)]
am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
08523e680e1ec1e4ec521c7e732e60fd85f553a4':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:47:02 +0000 (00:47 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 00:46:07 +0000 (00:46 +0000)]
am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
52be792bad7cbd059daab02a23e28ef1df61f2ce':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:45:42 +0000 (00:45 +0000)]
am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
363f4d4e2a53774b7b7c1ea995fc912291f5b84e':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:36:41 +0000 (00:36 +0000)]
am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
27d3b9264e2dcfb86400a60891a5e39cdf027d55':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:35:59 +0000 (00:35 +0000)]
am
c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
c8cbff8bdc6c8e61a177eeb1aa728038e0aa86dd':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:34:21 +0000 (00:34 +0000)]
am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
8bf221bd706a1bcb18f2c14cacbe4edbbc0a3a61':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:34:13 +0000 (00:34 +0000)]
am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
43214e0c19c13acbf1ecd714167abf03283d54ef':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
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
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
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
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
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
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
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
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
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
Joe Fernandez [Wed, 24 Sep 2014 15:44:50 +0000 (15:44 +0000)]
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
Joe Fernandez [Wed, 24 Sep 2014 15:39:01 +0000 (15:39 +0000)]
Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
Joe Fernandez [Fri, 19 Sep 2014 17:11:34 +0000 (10:11 -0700)]
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Change-Id: Iab735d07e705f019828d649e370fe5ef5006f305
Jeff Vander Stoep [Tue, 23 Sep 2014 17:12:38 +0000 (17:12 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 17:11:58 +0000 (17:11 +0000)]
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()
Jeff Vander Stoep [Tue, 23 Sep 2014 17:02:13 +0000 (17:02 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 17:02:04 +0000 (17:02 +0000)]
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()
Jeff Vander Stoep [Tue, 23 Sep 2014 16:50:29 +0000 (16:50 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 16:50:16 +0000 (16:50 +0000)]
am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
1c2eaa784b2376b674cf438f42342271c8aa79a8':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Tue, 23 Sep 2014 16:34:53 +0000 (16:34 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 16:24:36 +0000 (16:24 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 16:13:41 +0000 (16:13 +0000)]
Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
Jeff Vander Stoep [Mon, 22 Sep 2014 22:15:58 +0000 (15:15 -0700)]
Sanity-check paths of files to be restored
(cherry picked from commit
7d51cc701a6735cf455af8479f56c9c0b2109e02)
Bug:
16298491
Change-Id: I0c2d6523c9d152dad4d27d06d3853afd432e5af7
Ricardo Cervera [Mon, 22 Sep 2014 21:37:06 +0000 (21:37 +0000)]
am
556f23aa: Merge "docs: Fixed Developer Tools image. Bug:
17609483" into klp-modular-docs
* commit '
556f23aa1ae01832611e5e3b4059b47e6a7a00fb':
docs: Fixed Developer Tools image. Bug:
17609483
Ricardo Cervera [Mon, 22 Sep 2014 21:26:34 +0000 (21:26 +0000)]
Merge "docs: Fixed Developer Tools image. Bug:
17609483" into klp-modular-docs
David Friedman [Mon, 22 Sep 2014 20:41:17 +0000 (20:41 +0000)]
am
8dcf1c32: Fixes two typos, one in each file.
* commit '
8dcf1c32299e2c1c58c053925c572d58f2a74ee9':
Fixes two typos, one in each file.
Ricardo Cervera [Mon, 22 Sep 2014 19:55:43 +0000 (12:55 -0700)]
docs: Fixed Developer Tools image. Bug:
17609483
Change-Id: I400713dfe5ca54da193dccf15dac117dc4e11ca2
David Friedman [Fri, 19 Sep 2014 01:24:49 +0000 (18:24 -0700)]
Fixes two typos, one in each file.
Change-Id: I5f4a9100d20f8ad50052d63dc106a030ac75b1b0
Dirk Dougherty [Wed, 17 Sep 2014 22:20:38 +0000 (15:20 -0700)]
Doc change: Add IAB v2 deprecation notice.
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1
Conflicts:
docs/html/google/play/billing/index.jd
Robert Ly [Wed, 17 Sep 2014 15:19:15 +0000 (15:19 +0000)]
am
fc95c477: docs: edu changes for launch
* commit '
fc95c477835f86d99cf8c7ce5c1dd098fa42e69c':
docs: edu changes for launch
Robert Ly [Fri, 12 Sep 2014 17:19:40 +0000 (10:19 -0700)]
docs: edu changes for launch
Change-Id: Ia9047138bd9972e572b5dd93310339b630a2810d
Andrew Solovay [Wed, 17 Sep 2014 06:01:09 +0000 (06:01 +0000)]
am
a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
* commit '
a209406faa1f2b0f1dd7b6e3c5a468729f1c562f':
Docs: Updated to include new Subscriptions functionality.
Andrew Solovay [Wed, 17 Sep 2014 02:21:09 +0000 (02:21 +0000)]
Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
Robert Ly [Mon, 15 Sep 2014 19:27:18 +0000 (19:27 +0000)]
am
e152b793: docs: remove fire and forget language from wear docs
* commit '
e152b793e5f56ac9d73d0b3e3e191fea6b0ba1e5':
docs: remove fire and forget language from wear docs
Robert Ly [Mon, 15 Sep 2014 17:46:23 +0000 (10:46 -0700)]
docs: remove fire and forget language from wear docs
Change-Id: I0a8d83ba0db24f1232d4c729f298c6af04c048b3
Joe Fernandez [Fri, 12 Sep 2014 23:42:04 +0000 (23:42 +0000)]
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
Joe Fernandez [Fri, 12 Sep 2014 23:28:53 +0000 (23:28 +0000)]
Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs
Joe Fernandez [Fri, 12 Sep 2014 23:24:01 +0000 (16:24 -0700)]
docs: remove bad link in the quick view box for TV Recommendations #2
Change-Id: I649d8d735bda2b0c657217bc86c1a29a2d7eddc2
kmccormick [Fri, 12 Sep 2014 18:49:18 +0000 (18:49 +0000)]
am
7392152b: Doc Update: update Cloud Platform link
* commit '
7392152ba21917aff15db89988e1317819b5dd72':
Doc Update: update Cloud Platform link
kmccormick [Fri, 12 Sep 2014 01:25:42 +0000 (18:25 -0700)]
Doc Update: update Cloud Platform link
Fix for:
b/
17411644
Change-Id: I3893ed25d7b058e2635a56113af74d20284688af
Jeff Vander Stoep [Thu, 11 Sep 2014 18:58:49 +0000 (18:58 +0000)]
am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
660af7eb1a55e2df7da45aa63ca227141ef86b34':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Thu, 11 Sep 2014 18:47:53 +0000 (18:47 +0000)]
am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
59c1202e10c53587222a98e8c2f6ee3ff0fa1c3f':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Thu, 11 Sep 2014 18:41:09 +0000 (18:41 +0000)]
Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
Jon Larimer [Thu, 11 Sep 2014 16:33:07 +0000 (16:33 +0000)]
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...
Jon Larimer [Thu, 11 Sep 2014 16:23:39 +0000 (16:23 +0000)]
am
61c6ff7b: Merge "Fix issue #
16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev
* commit '
61c6ff7b70e2d42b44d5c5f9c3c8e3c67b584a76':
Fix issue #
16794553: Duplicate ArrayMap entries in Bundle...
Jon Larimer [Thu, 11 Sep 2014 16:15:24 +0000 (16:15 +0000)]
Merge "Fix issue #
16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev
Jean-Michel Trivi [Thu, 11 Sep 2014 04:23:21 +0000 (04:23 +0000)]
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
Jean-Michel Trivi [Thu, 11 Sep 2014 04:16:10 +0000 (04:16 +0000)]
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
Jean-Michel Trivi [Thu, 11 Sep 2014 00:51:32 +0000 (00:51 +0000)]
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
Ricardo Cervera [Thu, 11 Sep 2014 00:06:13 +0000 (00:06 +0000)]
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
Ricardo Cervera [Thu, 11 Sep 2014 00:06:10 +0000 (00:06 +0000)]
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
Ricardo Cervera [Wed, 10 Sep 2014 23:57:45 +0000 (23:57 +0000)]
Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug:
16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs
Ricardo Cervera [Wed, 10 Sep 2014 23:57:15 +0000 (23:57 +0000)]
Merge "docs: Fixed minor bug in downloads class. Bug:
16948533" into klp-modular-docs
Dianne Hackborn [Wed, 13 Aug 2014 22:39:50 +0000 (15:39 -0700)]
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)
Jeff Vander Stoep [Wed, 10 Sep 2014 21:20:14 +0000 (14:20 -0700)]
Change permission guard on bindBackupAgent()
Bug:
15829193
Change-Id: I6c1c39923b7b1a9f528f97da10913cb7f2d7e8f9
Jean-Michel Trivi [Wed, 10 Sep 2014 20:59:32 +0000 (20:59 +0000)]
am
e825f0ee: am
60f22fbf: Do not restore the media button event receiver
* commit '
e825f0eec571831ceb60e65ec7e2a6b1ed7be5bd':
Do not restore the media button event receiver
Jean-Michel Trivi [Wed, 10 Sep 2014 20:47:57 +0000 (20:47 +0000)]
am
60f22fbf: Do not restore the media button event receiver
* commit '
60f22fbf67a69e8f3604afb46ccd7c3bd2819cb1':
Do not restore the media button event receiver
Andrew Solovay [Thu, 21 Aug 2014 18:16:47 +0000 (11:16 -0700)]
Docs: Updated to include new Subscriptions functionality.
Includes refund/revoke, seasonal subscriptions, etc.
Docs are staged to:
http://asolovay.mtv:9393/google/play/billing/index.html
http://asolovay.mtv:9393/google/play/billing/billing_subscriptions.html
Change-Id: Id8ad33025c2ae165d6fc5e050c4f2aef70acc0d0
Robert Ly [Wed, 10 Sep 2014 18:04:16 +0000 (18:04 +0000)]
am
0743bca5: docs: add 64k method limit note
* commit '
0743bca58961582078f4e8199fe9a6fa044036eb':
docs: add 64k method limit note
Robert Ly [Wed, 10 Sep 2014 17:50:46 +0000 (10:50 -0700)]
docs: add 64k method limit note
Change-Id: I6590fc996331c1f2024276d338c4035f2cb0f18d
Jean-Michel Trivi [Wed, 10 Sep 2014 16:15:50 +0000 (09:15 -0700)]
Do not restore the media button event receiver
Do not restore the media button event receiver on behalf of the
application that registered. Prevents reported vulnerability.
Bug
15428797
Change-Id: If40ee6bc0c77c191643129daa92eb26755e70cb0
Robert Ly [Tue, 9 Sep 2014 23:40:51 +0000 (23:40 +0000)]
am
52a18161: docs: update api dashboard for september
* commit '
52a1816180c7a85b13c543a5cdb6a7506cb8f01d':
docs: update api dashboard for september
Robert Ly [Tue, 9 Sep 2014 22:40:50 +0000 (15:40 -0700)]
docs: update api dashboard for september
Change-Id: Icae4efd0729b61c0f6c1850da641bc065bc12122
Dirk Dougherty [Mon, 8 Sep 2014 23:53:32 +0000 (23:53 +0000)]
am
552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs
* commit '
552e5ce6bb418b9a8b3b1ba9c102c562d0a4019e':
Doc change: Add note to use explicit intent when binding to billing service.
Dirk Dougherty [Mon, 8 Sep 2014 23:46:55 +0000 (23:46 +0000)]
Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs
Robert Ly [Mon, 8 Sep 2014 22:43:42 +0000 (22:43 +0000)]
am
b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
* commit '
b5a21ad3fba1d8d3b096a0d685d71c148fefa11b':
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
Robert Ly [Mon, 8 Sep 2014 22:30:09 +0000 (22:30 +0000)]
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
This reverts commit
4186379a2a37123d31ce5d1aff1facc8e7dfbfd3.
Change-Id: I34a7b8689362053c0ad8124eaa3f40a5c282bc80