OSDN Git Service
John Reck [Tue, 25 Jun 2013 22:34:16 +0000 (15:34 -0700)]
am
9d2b0dbf: am
12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"
* commit '
9d2b0dbf67844ead1a0aeb22e1e3097d2ec60171':
Fix deadlock of WebViewCoreThread
John Reck [Tue, 25 Jun 2013 22:31:39 +0000 (15:31 -0700)]
am
12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"
* commit '
12c4c0e45b12be18005f0ad2af2433e34dcb1a9f':
Fix deadlock of WebViewCoreThread
John Reck [Tue, 25 Jun 2013 22:28:02 +0000 (22:28 +0000)]
Merge "Fix deadlock of WebViewCoreThread"
Svetoslav [Tue, 25 Jun 2013 22:01:16 +0000 (15:01 -0700)]
am
a0b9e1ee: am
99e4a0f5: Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev
* commit '
a0b9e1eead9cbde980ca5ee8406100d9f3bb8d4d':
Improper initialization of the accessibility manager service.
Svetoslav [Tue, 25 Jun 2013 21:59:12 +0000 (14:59 -0700)]
am
99e4a0f5: Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev
* commit '
99e4a0f576bad57782b31f1b3329a3d2408f42ae':
Improper initialization of the accessibility manager service.
Svetoslav [Tue, 25 Jun 2013 21:55:46 +0000 (21:55 +0000)]
Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev
Christopher Tate [Mon, 24 Jun 2013 23:08:15 +0000 (16:08 -0700)]
am
34718238: am
3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app"
* commit '
347182386c54fd4aa4478f35b712c230eb290468':
Avoid adding FORWARD_LOCK flag to an updated system app
Christopher Tate [Mon, 24 Jun 2013 23:05:49 +0000 (16:05 -0700)]
am
3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app"
* commit '
3e7d0344399ac2f607fddde32c1a5e54228a38f9':
Avoid adding FORWARD_LOCK flag to an updated system app
Christopher Tate [Mon, 24 Jun 2013 23:02:00 +0000 (23:02 +0000)]
Merge "Avoid adding FORWARD_LOCK flag to an updated system app"
Jean-Baptiste Queru [Mon, 24 Jun 2013 22:13:28 +0000 (15:13 -0700)]
am
5b3afe3a: am
4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout"
* commit '
5b3afe3a84cad94642360df01c39ebb2a3ee14ba':
Lockscreen : Reference correct layout
Jean-Baptiste Queru [Mon, 24 Jun 2013 21:27:28 +0000 (14:27 -0700)]
am
4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout"
* commit '
4be48d436bb2d8d2207b317f9a826c27671b6d4b':
Lockscreen : Reference correct layout
Jean-Baptiste Queru [Mon, 24 Jun 2013 21:15:45 +0000 (21:15 +0000)]
Merge "Lockscreen : Reference correct layout"
Danesh Mondegarian [Mon, 24 Jun 2013 20:00:35 +0000 (16:00 -0400)]
Lockscreen : Reference correct layout
Include correct layout for portrait.
Change-Id: I6de511357aec0f4364cd68c3ed740c7d4f47379d
Joe Malin [Mon, 24 Jun 2013 19:12:50 +0000 (12:12 -0700)]
am
6d324c82: am
f285a709: Merge "Bug
9517413: Activity Detection tutorial has errors" into jb-mr2-dev
* commit '
6d324c82c603fca0afdfd2061f162fcffc0baea6':
Bug
9517413: Activity Detection tutorial has errors
Joe Malin [Mon, 24 Jun 2013 17:31:40 +0000 (10:31 -0700)]
am
f285a709: Merge "Bug
9517413: Activity Detection tutorial has errors" into jb-mr2-dev
* commit '
f285a709157b16ed970573988dec603dde89cb11':
Bug
9517413: Activity Detection tutorial has errors
Joe Malin [Mon, 24 Jun 2013 17:15:25 +0000 (17:15 +0000)]
Merge "Bug
9517413: Activity Detection tutorial has errors" into jb-mr2-dev
Dirk Dougherty [Mon, 24 Jun 2013 08:45:36 +0000 (01:45 -0700)]
am
d73e151e: am
3d1c9b07: am
eadad05c: am
d8dff038: am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
d73e151eaca8615015948d535d90397c8719c5f4':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:42:27 +0000 (01:42 -0700)]
am
3d1c9b07: am
eadad05c: am
d8dff038: am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
3d1c9b0710efa265e1ead34ee48a487c5ad4f66f':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:39:52 +0000 (01:39 -0700)]
am
eadad05c: am
d8dff038: am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
eadad05c341b418cfe6249fb16d91951a3432c8a':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:37:52 +0000 (01:37 -0700)]
am
d8dff038: am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
d8dff038f9368decd5a9e1176e453a24e4309290':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:34:48 +0000 (01:34 -0700)]
am
1c77f5e2: am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
1c77f5e2757e589bfc8c1e89e6394504f576ac52':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:32:54 +0000 (01:32 -0700)]
am
1c111395: am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
1c1113958d4e27018b02ce793809d541158440f6':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 08:30:58 +0000 (01:30 -0700)]
am
8451fc4f: Doc change: edits to education opt-in docs.
* commit '
8451fc4f8660842b21e4ed3bddaedb0eb9490855':
Doc change: edits to education opt-in docs.
Dirk Dougherty [Mon, 24 Jun 2013 07:30:38 +0000 (00:30 -0700)]
Doc change: edits to education opt-in docs.
Change-Id: I258a8f89c3bdbb6b5dabfe96cc7dd66dd16b8052
Dirk Dougherty [Mon, 24 Jun 2013 02:53:00 +0000 (19:53 -0700)]
am
0efa541a: am
6561c275: am
6755a4d4: am
757b943a: am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
0efa541a0156396290e03c82c8b28326380c9e4a':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:50:32 +0000 (19:50 -0700)]
am
6561c275: am
6755a4d4: am
757b943a: am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
6561c27519d710e79a7b2d15e29fcccb2f714c94':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:45:02 +0000 (19:45 -0700)]
am
6755a4d4: am
757b943a: am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
6755a4d433d44506abd932b62f6552fa37bf1dd9':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:42:58 +0000 (19:42 -0700)]
am
757b943a: am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
757b943a92d23c255dcca15944908f105265a86b':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:41:29 +0000 (19:41 -0700)]
am
b2e3fb4f: am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
b2e3fb4f37e6cf0e2c9e3aa00facfac9fbd4e22d':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:39:30 +0000 (19:39 -0700)]
am
9db29158: am
f812258e: Doc change: add docs for edu opt-in.
* commit '
9db291583a90babbcb6db6f2b82276f5657a3503':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 02:37:14 +0000 (19:37 -0700)]
am
f812258e: Doc change: add docs for edu opt-in.
* commit '
f812258e5ca9449402781a7330c0e3696f566e09':
Doc change: add docs for edu opt-in.
Dirk Dougherty [Mon, 24 Jun 2013 00:33:15 +0000 (17:33 -0700)]
Doc change: add docs for edu opt-in.
Change-Id: Ieb9f77e3efd64c42c719167dd6e6c6d7360bcfa4
Scott Main [Sat, 22 Jun 2013 03:51:37 +0000 (20:51 -0700)]
am
aa837ded: am
86c9d47c: update homepage carousel for jelly bean 3.0
* commit '
aa837dedf85eabde76cf8d5ec57e42f78832e8a6':
update homepage carousel for jelly bean 3.0
Scott Main [Sat, 22 Jun 2013 03:44:39 +0000 (20:44 -0700)]
am
86c9d47c: update homepage carousel for jelly bean 3.0
* commit '
86c9d47cb7a1e2b3868e0152f1df9ef335555f52':
update homepage carousel for jelly bean 3.0
Scott Main [Sat, 22 Jun 2013 03:39:41 +0000 (20:39 -0700)]
update homepage carousel for jelly bean 3.0
Change-Id: Ie698493e4da0232b67630f92e80bf025be24884a
Scott Main [Sat, 22 Jun 2013 03:33:24 +0000 (20:33 -0700)]
am
c2d92db8: am
bcd6f76a: Merge "typo" into jb-mr2-dev
* commit '
c2d92db8c0ca3d9d045f5f710f4d90db8684b439':
typo
Scott Main [Sat, 22 Jun 2013 03:30:12 +0000 (20:30 -0700)]
am
bcd6f76a: Merge "typo" into jb-mr2-dev
* commit '
bcd6f76ac9ebcf1745f1cfce975d8e9835cd4bab':
typo
Scott Main [Sat, 22 Jun 2013 03:28:09 +0000 (20:28 -0700)]
am
90e2e8db: am
4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev
* commit '
90e2e8db2f74b25cff0cfe7e59f88a37d49da3a8':
add jb-mr2 api overview
Scott Main [Sat, 22 Jun 2013 03:26:26 +0000 (03:26 +0000)]
Merge "typo" into jb-mr2-dev
Scott Main [Sat, 22 Jun 2013 03:25:45 +0000 (20:25 -0700)]
am
4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev
* commit '
4129cfe1e4abf2366e395f36804a866b13241d28':
add jb-mr2 api overview
Scott Main [Sat, 22 Jun 2013 03:25:23 +0000 (20:25 -0700)]
typo
Change-Id: I4dcb7c67313a8e3f42ae9f56e4c0ce6e5874dfc7
Scott Main [Sat, 22 Jun 2013 03:23:50 +0000 (03:23 +0000)]
Merge "add jb-mr2 api overview" into jb-mr2-dev
Scott Main [Sat, 15 Jun 2013 01:01:10 +0000 (18:01 -0700)]
add jb-mr2 api overview
Change-Id: Ib46c3ad3318d19927f47f1bb0ada93adf7766147
Svetoslav [Wed, 19 Jun 2013 23:28:30 +0000 (16:28 -0700)]
Improper initialization of the accessibility manager service.
Initially the current user in the accessibility manager service is the
owner. This is correct since the system should be able to respond to
queries immediately and their result depends on the current user. However,
the system is calling the user switch callback with the current user
which is the same as the one we initialized with. Switching the user
causes clearing state for the old user winch is in case the current
one. Hence, we are losing state for the current user. This behavior was
masked from the fact that accidentally no events in the system were
fired before the first use user switch call.
repo Losing current user state puts the manager service in an inconsistent
state and it binds to accessibility services more than once. As a result
the accessibility layer starts to misbehave rendering the device useless
to a blind user.
Now we are ignoring user switch callbacks if the new user is the same
as the current one. Since we can no longer initialize at the first user
switch, this change adds explicit system ready method called from
the system server at the right moment.
bug:
9496697
Change-Id: Icb39e929ea44e6c0360aba7ddc12f941ca2c9f98
kmccormick [Fri, 21 Jun 2013 23:31:41 +0000 (16:31 -0700)]
am
75c59fb9: am
dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
* commit '
75c59fb9d9a1408146165300eae0899a965897bf':
Doc change: new Bluetooth LE doc
kmccormick [Fri, 21 Jun 2013 23:29:23 +0000 (16:29 -0700)]
am
dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
* commit '
dc22fa924a6df52fb6ad97aa63150c815a2f047f':
Doc change: new Bluetooth LE doc
kmccormick [Fri, 21 Jun 2013 23:00:18 +0000 (23:00 +0000)]
Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
kmccormick [Thu, 6 Jun 2013 18:14:57 +0000 (11:14 -0700)]
Doc change: new Bluetooth LE doc
Change-Id: Ib6d67497a9b4d54d13b4da8f1f9ee991bc5ef562
Wink Saville [Fri, 21 Jun 2013 19:15:54 +0000 (12:15 -0700)]
am
7334d25e: am
34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
* commit '
7334d25e79d733b419aacfd706aad762f823f2f9':
Fix misspelling of getLteSignalStrenght.
Wink Saville [Fri, 21 Jun 2013 19:12:24 +0000 (12:12 -0700)]
am
34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."
* commit '
34fb4eae36bc926886149718672809a1ad43be97':
Fix misspelling of getLteSignalStrenght.
Wink Saville [Fri, 21 Jun 2013 19:06:54 +0000 (19:06 +0000)]
Merge "Fix misspelling of getLteSignalStrenght."
The Android Open Source Project [Fri, 21 Jun 2013 18:56:57 +0000 (11:56 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id59401f35b9a467ddcc56c2167d6c30bb6c3d3e9
The Android Automerger [Fri, 21 Jun 2013 18:35:45 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
kmccormick [Fri, 21 Jun 2013 18:24:00 +0000 (11:24 -0700)]
am
42449d48: am
da4a3f32: am
107e4830: am
3f4759a0: am
947857c1: am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
42449d4842af545e76591d5aee8ee715b0d1a485':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Dirk Dougherty [Fri, 21 Jun 2013 18:23:57 +0000 (11:23 -0700)]
am
f542a8b2: am
0628e3fe: am
c496c2a8: am
68630bed: am
8054c46e: am
e4bc7d81: am
6cb24e40: Doc change: add video for edu page.
* commit '
f542a8b2fecf74c5ae9eb2be08bcac36405e084a':
Doc change: add video for edu page.
kmccormick [Fri, 21 Jun 2013 18:18:47 +0000 (11:18 -0700)]
am
da4a3f32: am
107e4830: am
3f4759a0: am
947857c1: am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
da4a3f324b2944e3f088b67981ef30447a6fdeed':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
kmccormick [Fri, 21 Jun 2013 18:14:44 +0000 (11:14 -0700)]
am
107e4830: am
3f4759a0: am
947857c1: am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
107e48304516e810f0ecc20a540cce1bc25f252c':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Dirk Dougherty [Fri, 21 Jun 2013 18:11:11 +0000 (11:11 -0700)]
am
0628e3fe: am
c496c2a8: am
68630bed: am
8054c46e: am
e4bc7d81: am
6cb24e40: Doc change: add video for edu page.
* commit '
0628e3fec9e75c960f8aed871afb26c021b1b2da':
Doc change: add video for edu page.
Dirk Dougherty [Fri, 21 Jun 2013 18:07:44 +0000 (11:07 -0700)]
am
c496c2a8: am
68630bed: am
8054c46e: am
e4bc7d81: am
6cb24e40: Doc change: add video for edu page.
* commit '
c496c2a8889f1b676bb48c77c81bf8d3f39ed3a1':
Doc change: add video for edu page.
kmccormick [Fri, 21 Jun 2013 18:05:26 +0000 (11:05 -0700)]
am
3f4759a0: am
947857c1: am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
3f4759a0268860511ff844c59968843e2985d3ef':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Joe Malin [Thu, 20 Jun 2013 23:22:55 +0000 (16:22 -0700)]
Bug
9517413: Activity Detection tutorial has errors
Change-Id: I48d0986053262cd0ce3e20b280e4aa0f2151fc05
kmccormick [Fri, 21 Jun 2013 17:59:18 +0000 (10:59 -0700)]
am
947857c1: am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
947857c11b9c50d97b9952bbbc29149680e7d4a3':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
kmccormick [Fri, 21 Jun 2013 17:57:38 +0000 (10:57 -0700)]
am
cce88002: am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
cce880028ee694e296d2585b8932868b14f71223':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
kmccormick [Fri, 21 Jun 2013 17:56:13 +0000 (10:56 -0700)]
am
9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
* commit '
9c309d3db95b1fc63925a18b81e6ceabcaa18407':
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Scott Main [Fri, 21 Jun 2013 17:45:33 +0000 (10:45 -0700)]
am
3aeba489: am
fbba76fe: am
20eac772: am
334dadec: am
033cfd7c: Merge "add Arabic Google Play badges to generator bug:
7994508" into jb-mr1.1-ub-dev
* commit '
3aeba489b4df2522375356daf5358bf6938c5a96':
add Arabic Google Play badges to generator bug:
7994508
Scott Main [Fri, 21 Jun 2013 17:43:34 +0000 (10:43 -0700)]
am
fbba76fe: am
20eac772: am
334dadec: am
033cfd7c: Merge "add Arabic Google Play badges to generator bug:
7994508" into jb-mr1.1-ub-dev
* commit '
fbba76fe21f937e935dcaebd677b22479d2e32a2':
add Arabic Google Play badges to generator bug:
7994508
Scott Main [Fri, 21 Jun 2013 17:38:37 +0000 (10:38 -0700)]
am
20eac772: am
334dadec: am
033cfd7c: Merge "add Arabic Google Play badges to generator bug:
7994508" into jb-mr1.1-ub-dev
* commit '
20eac772f32e3b40959a8fb7c64565aad94b8054':
add Arabic Google Play badges to generator bug:
7994508
Wink Saville [Fri, 21 Jun 2013 16:58:11 +0000 (09:58 -0700)]
Fix misspelling of getLteSignalStrenght.
Change to getLteSignalStrength.
Change-Id: Ie2acec9e01af0e64a61902383f06729a7cee1975
Wink Saville [Fri, 21 Jun 2013 15:52:07 +0000 (08:52 -0700)]
am
d446dd75: am
446792ba: Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
* commit '
d446dd756081ec75693fc538e3460c9a2c758fe4':
The config_show4GForLTe is dynamic use latest value.
Wink Saville [Fri, 21 Jun 2013 15:49:26 +0000 (08:49 -0700)]
am
446792ba: Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
* commit '
446792ba75459908d4f9ad322c08566a52e1f91e':
The config_show4GForLTe is dynamic use latest value.
Wink Saville [Fri, 21 Jun 2013 15:43:56 +0000 (15:43 +0000)]
Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev
Iliyan Malchev [Fri, 21 Jun 2013 03:15:09 +0000 (20:15 -0700)]
am
e6345a19: am
9233fc00: Revert "Revert "wifi: Get full scan results""
* commit '
e6345a19129484572d3200edfff7f002a4314d0b':
Revert "Revert "wifi: Get full scan results""
Iliyan Malchev [Fri, 21 Jun 2013 03:13:04 +0000 (20:13 -0700)]
am
9233fc00: Revert "Revert "wifi: Get full scan results""
* commit '
9233fc0023755e190e7c28374c5c6fa6558dec70':
Revert "Revert "wifi: Get full scan results""
Iliyan Malchev [Fri, 21 Jun 2013 03:09:44 +0000 (03:09 +0000)]
Revert "Revert "wifi: Get full scan results""
This reverts commit
c2cbd4c11bfb83344502bd80389538795bae03cb.
Change-Id: Ia1cbde588ae9706966d6340c702fcfe1a82cfa79
Wink Saville [Fri, 21 Jun 2013 01:15:20 +0000 (18:15 -0700)]
The config_show4GForLTe is dynamic use latest value.
Previously this was updated only at construction time,
but the value isn't even set at that time and can change
at anytime. So instead read the current value when needed.
Bug:
9513380
Change-Id: I50c676beadf5df8190897a9f6ab94c098e8d7e71
The Android Open Source Project [Fri, 21 Jun 2013 00:31:59 +0000 (17:31 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I179642d15ce613dac101897cadf2c63ca60c5a11
kmccormick [Tue, 11 Jun 2013 20:17:55 +0000 (13:17 -0700)]
Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Change-Id: I32fe3880852ed8bcbacec0bb5bf385b0022a791f
Dirk Dougherty [Thu, 20 Jun 2013 22:35:59 +0000 (15:35 -0700)]
am
68630bed: am
8054c46e: am
e4bc7d81: am
6cb24e40: Doc change: add video for edu page.
* commit '
68630bedefb36cb6789f573b065c13e441121611':
Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:33:47 +0000 (15:33 -0700)]
am
8054c46e: am
e4bc7d81: am
6cb24e40: Doc change: add video for edu page.
* commit '
8054c46e9bb87bb481195a6b823fd9d72623c80d':
Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:31:48 +0000 (15:31 -0700)]
am
e4bc7d81: am
6cb24e40: Doc change: add video for edu page.
* commit '
e4bc7d812199a8d371da264575c74874877d4824':
Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 22:29:27 +0000 (15:29 -0700)]
am
6cb24e40: Doc change: add video for edu page.
* commit '
6cb24e40ce6218dcd56ad22e13587d7f3d6e54b9':
Doc change: add video for edu page.
Dirk Dougherty [Thu, 20 Jun 2013 20:52:21 +0000 (13:52 -0700)]
Doc change: add video for edu page.
Change-Id: I81c539f0297de620ea0d0ded19d398329218f5df
Wink Saville [Wed, 19 Jun 2013 18:28:06 +0000 (11:28 -0700)]
TelephonyManager.listen can have notifyNow always true.
Since telepony.registry is a real system service notifyNow
parameter doesn't need to be conditional as telephony.registery
will never go away.
This is different from most of the other TelephonyManager
methods which are used to invoke methods on the phone service
which implements ITelephony and is implemented by
PhoneInterfaceManager in the phone application. Since the
phone app is not a system service it can and does go away when
it crashes.
Bug:
9393863
Change-Id: I1a8afc12b0e139e72f05820e49f3d996aec2b52a
Scott Main [Mon, 10 Jun 2013 21:30:35 +0000 (14:30 -0700)]
add ViewGroup's layoutMode attribute to public resources
bug:
9359960
Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
The Android Open Source Project [Thu, 20 Jun 2013 14:18:25 +0000 (07:18 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6ca669228f4605710cf3c67176f982d673f5c2cd
kmccormick [Wed, 19 Jun 2013 23:43:17 +0000 (16:43 -0700)]
am
fb45dbeb: am
748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
* commit '
fb45dbeb216f513905e3c2bb7a86da6558862f42':
Doc change: New class on avoiding save conflicts
kmccormick [Wed, 19 Jun 2013 23:41:07 +0000 (16:41 -0700)]
am
748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
* commit '
748f6c854822c01ebf805202935037300d351104':
Doc change: New class on avoiding save conflicts
kmccormick [Wed, 19 Jun 2013 23:38:33 +0000 (23:38 +0000)]
Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev
kmccormick [Tue, 11 Jun 2013 20:17:55 +0000 (13:17 -0700)]
Doc change: New class on avoiding save conflicts
Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
Wink Saville [Wed, 19 Jun 2013 20:21:41 +0000 (13:21 -0700)]
am
7f081794: am
c80e3d43: TelephonyManager.listen can have notifyNow always true.
* commit '
7f081794074c1356ba347b802729adf36f06ad19':
TelephonyManager.listen can have notifyNow always true.
Wink Saville [Wed, 19 Jun 2013 20:19:02 +0000 (13:19 -0700)]
am
c80e3d43: TelephonyManager.listen can have notifyNow always true.
* commit '
c80e3d434f034d8594014df2fe028e9420930ea8':
TelephonyManager.listen can have notifyNow always true.
Wink Saville [Wed, 19 Jun 2013 18:28:06 +0000 (11:28 -0700)]
TelephonyManager.listen can have notifyNow always true.
Since telepony.registry is a real system service notifyNow
parameter doesn't need to be conditional as telephony.registery
will never go away.
This is different from most of the other TelephonyManager
methods which are used to invoke methods on the phone service
which implements ITelephony and is implemented by
PhoneInterfaceManager in the phone application. Since the
phone app is not a system service it can and does go away when
it crashes.
Bug:
9393863
Change-Id: I1a8afc12b0e139e72f05820e49f3d996aec2b52a
Wink Saville [Wed, 19 Jun 2013 17:14:25 +0000 (10:14 -0700)]
am
a5dc5846: am
cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
* commit '
a5dc5846502c13edd74ffd677d11e250b88ec17a':
Change default for config_show4GForLte to true.
Wink Saville [Wed, 19 Jun 2013 17:11:49 +0000 (10:11 -0700)]
am
cc892d68: Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
* commit '
cc892d68c897f51b8998f7de11302bb9b9cebbff':
Change default for config_show4GForLte to true.
Wink Saville [Wed, 19 Jun 2013 17:09:28 +0000 (17:09 +0000)]
Merge "Change default for config_show4GForLte to true." into jb-mr2-dev
Stephen Hines [Wed, 19 Jun 2013 16:36:27 +0000 (09:36 -0700)]
am
6e0e9b48: am
713c4bca: Update RenderScript doxygen reference manual.
* commit '
6e0e9b48d0722ff96cfc69af1474572ee194da68':
Update RenderScript doxygen reference manual.
Stephen Hines [Wed, 19 Jun 2013 16:35:06 +0000 (09:35 -0700)]
am
713c4bca: Update RenderScript doxygen reference manual.
* commit '
713c4bca939b8cd6ae4915c4ccf464eed7a8b6a6':
Update RenderScript doxygen reference manual.
Stephen Hines [Wed, 19 Jun 2013 07:11:21 +0000 (00:11 -0700)]
Update RenderScript doxygen reference manual.
Change-Id: I0ba8f1c6c9b727b337708a3001964a7ee323483c
Vineeta Srivastava [Mon, 17 Jun 2013 20:24:47 +0000 (20:24 +0000)]
Revert "wifi: Get full scan results"
This reverts commit
67b3fbf49c0c92641e19e3278a1feab7b68aa7b8.
Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713
Conflicts:
wifi/java/android/net/wifi/WifiNative.java
wifi/java/android/net/wifi/WifiStateMachine.java
Scott Main [Mon, 10 Jun 2013 21:30:35 +0000 (14:30 -0700)]
add ViewGroup's layoutMode attribute to public resources
bug:
9359960
Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
OSDN Git Service
