104596 Commits

Author SHA1 Message Date
Amith Yamasani
16a2268f80 am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev
* commit 'e6304a9c075ed927fc6bdffcc3191dc829f779fa':
  When a new user AID is generated, dump it to dropbox
2013-06-28 10:12:21 -07:00
Amith Yamasani
e6304a9c07 Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev 2013-06-28 17:08:38 +00:00
Amith Yamasani
5cdf7f5b2a When a new user AID is generated, dump it to dropbox
Bug: 9595851
Change-Id: I6fde757eed84d7914db180e80c9d68448b3e5780
2013-06-28 09:58:43 -07:00
Romain Guy
b254c242d9 Fix out of range glCopyTexImage2D
Bug #9425270

A better solution would be to use glCopyTexImage2D whenever possible but
this change would be a little more dangerous.

Change-Id: Ib1aaceda39d838716285ef97f356721416822dbb
2013-06-27 17:15:24 -07:00
Yorke Lee
f6ec304854 am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
* commit 'e6cb43a1ea50681d2da30ce5e8cb5ac97e80e88a':
  Rename Google Talk to Hangouts in framework
2013-06-27 14:50:11 -07:00
Romain Guy
93d46952db am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270
* commit '67603c6e1b88fa20db58f69354e3925ffba037d1':
  Recreate TextureView's display list on attach Bug #9425270
2013-06-27 14:50:08 -07:00
Yorke Lee
e6cb43a1ea Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev 2013-06-27 21:46:19 +00:00
Romain Guy
67603c6e1b Recreate TextureView's display list on attach
Bug #9425270

When a TextureView is detached from its window and immediately
re-attached, the display list is not destroyed but reused as is.
TextureView will however destroy the layer and surface texture
reference by the display list.

The solution is to force TextureView to invalidate its display
list on re-attach if it previously had a surface/layer pair.

Change-Id: I475096ffa7e5709155c4c943bf1bfaaaedbd4a1d
2013-06-27 10:58:10 -07:00
Robert Greenwalt
65f7a95fc4 am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev
* commit '2f50097a5d5a1fb60574c89c7202cc43ecb51c54':
  Fix power issues around wifi scans.
2013-06-26 10:51:35 -07:00
Robert Greenwalt
2f50097a5d Merge "Fix power issues around wifi scans." into jb-mr2-dev 2013-06-26 17:43:39 +00:00
Robert Greenwalt
8971084258 Fix power issues around wifi scans.
- Sending a broadcast indicating when scan requests could be serviced so that
apps don't request scans we won't do anything with.
- Fix our batt stats accounting so we only count it if we send the request to
the driver.

bug: 8868201
bug: 9496690
Change-Id: I64a4f1c294c848ac64c50d8854ed4a6a1a47f603
2013-06-26 10:00:16 -07:00
Svetoslav
a0b9e1eead am 99e4a0f5: Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev
* commit '99e4a0f576bad57782b31f1b3329a3d2408f42ae':
  Improper initialization of the accessibility manager service.
2013-06-25 14:59:12 -07:00
Svetoslav
99e4a0f576 Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev 2013-06-25 21:55:46 +00:00
Joe Malin
6d324c82c6 am f285a709: Merge "Bug 9517413: Activity Detection tutorial has errors" into jb-mr2-dev
* commit 'f285a709157b16ed970573988dec603dde89cb11':
  Bug 9517413: Activity Detection tutorial has errors
2013-06-24 10:31:40 -07:00
Joe Malin
f285a70915 Merge "Bug 9517413: Activity Detection tutorial has errors" into jb-mr2-dev 2013-06-24 17:15:25 +00:00
Dirk Dougherty
d73e151eac 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.
2013-06-24 01:42:27 -07:00
Dirk Dougherty
3d1c9b0710 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.
2013-06-24 01:39:52 -07:00
Dirk Dougherty
eadad05c34 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.
2013-06-24 01:37:52 -07:00
Dirk Dougherty
d8dff038f9 am 1c77f5e2: am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs.
* commit '1c77f5e2757e589bfc8c1e89e6394504f576ac52':
  Doc change: edits to education opt-in docs.
2013-06-24 01:34:48 -07:00
Dirk Dougherty
1c77f5e275 am 1c111395: am 8451fc4f: Doc change: edits to education opt-in docs.
* commit '1c1113958d4e27018b02ce793809d541158440f6':
  Doc change: edits to education opt-in docs.
2013-06-24 01:32:54 -07:00
Dirk Dougherty
1c1113958d am 8451fc4f: Doc change: edits to education opt-in docs.
* commit '8451fc4f8660842b21e4ed3bddaedb0eb9490855':
  Doc change: edits to education opt-in docs.
2013-06-24 01:30:58 -07:00
Dirk Dougherty
8451fc4f86 Doc change: edits to education opt-in docs.
Change-Id: I258a8f89c3bdbb6b5dabfe96cc7dd66dd16b8052
2013-06-24 00:58:04 -07:00
Dirk Dougherty
0efa541a01 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.
2013-06-23 19:50:32 -07:00
Dirk Dougherty
6561c27519 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.
2013-06-23 19:45:02 -07:00
Dirk Dougherty
6755a4d433 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.
2013-06-23 19:42:58 -07:00
Dirk Dougherty
757b943a92 am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in.
* commit 'b2e3fb4f37e6cf0e2c9e3aa00facfac9fbd4e22d':
  Doc change: add docs for edu opt-in.
2013-06-23 19:41:29 -07:00
Dirk Dougherty
b2e3fb4f37 am 9db29158: am f812258e: Doc change: add docs for edu opt-in.
* commit '9db291583a90babbcb6db6f2b82276f5657a3503':
  Doc change: add docs for edu opt-in.
2013-06-23 19:39:30 -07:00
Dirk Dougherty
9db291583a am f812258e: Doc change: add docs for edu opt-in.
* commit 'f812258e5ca9449402781a7330c0e3696f566e09':
  Doc change: add docs for edu opt-in.
2013-06-23 19:37:14 -07:00
Dirk Dougherty
f812258e5c Doc change: add docs for edu opt-in.
Change-Id: Ieb9f77e3efd64c42c719167dd6e6c6d7360bcfa4
2013-06-23 19:33:00 -07:00
Scott Main
aa837dedf8 am 86c9d47c: update homepage carousel for jelly bean 3.0
* commit '86c9d47cb7a1e2b3868e0152f1df9ef335555f52':
  update homepage carousel for jelly bean 3.0
2013-06-21 20:44:39 -07:00
Scott Main
86c9d47cb7 update homepage carousel for jelly bean 3.0
Change-Id: Ie698493e4da0232b67630f92e80bf025be24884a
2013-06-21 20:39:41 -07:00
Scott Main
c2d92db8c0 am bcd6f76a: Merge "typo" into jb-mr2-dev
* commit 'bcd6f76ac9ebcf1745f1cfce975d8e9835cd4bab':
  typo
2013-06-21 20:30:12 -07:00
Scott Main
bcd6f76ac9 Merge "typo" into jb-mr2-dev 2013-06-22 03:26:27 +00:00
Scott Main
90e2e8db2f am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev
* commit '4129cfe1e4abf2366e395f36804a866b13241d28':
  add jb-mr2 api overview
2013-06-21 20:25:45 -07:00
Scott Main
1c62a0fc32 typo
Change-Id: I4dcb7c67313a8e3f42ae9f56e4c0ce6e5874dfc7
2013-06-21 20:25:23 -07:00
Scott Main
4129cfe1e4 Merge "add jb-mr2 api overview" into jb-mr2-dev 2013-06-22 03:23:50 +00:00
Scott Main
8cc7db7d40 add jb-mr2 api overview
Change-Id: Ib46c3ad3318d19927f47f1bb0ada93adf7766147
2013-06-21 20:20:40 -07:00
Svetoslav
3b817aed7d 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
2013-06-21 18:38:20 -07:00
kmccormick
75c59fb9d9 am dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
* commit 'dc22fa924a6df52fb6ad97aa63150c815a2f047f':
  Doc change: new Bluetooth LE doc
2013-06-21 16:29:23 -07:00
kmccormick
dc22fa924a Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev 2013-06-21 23:00:18 +00:00
kmccormick
f14ff1c9ce Doc change: new Bluetooth LE doc
Change-Id: Ib6d67497a9b4d54d13b4da8f1f9ee991bc5ef562
2013-06-21 14:52:05 -07:00
kmccormick
42449d4842 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
2013-06-21 11:18:47 -07:00
kmccormick
da4a3f324b 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
2013-06-21 11:14:44 -07:00
Dirk Dougherty
f542a8b2fe 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.
2013-06-21 11:11:11 -07:00
Dirk Dougherty
0628e3fec9 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.
2013-06-21 11:07:44 -07:00
kmccormick
107e483045 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
2013-06-21 11:05:26 -07:00
Joe Malin
ef445f191b Bug 9517413: Activity Detection tutorial has errors
Change-Id: I48d0986053262cd0ce3e20b280e4aa0f2151fc05
2013-06-21 11:00:13 -07:00
kmccormick
3f4759a026 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
2013-06-21 10:59:18 -07:00
kmccormick
947857c11b 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
2013-06-21 10:57:38 -07:00
kmccormick
cce880028e 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
2013-06-21 10:56:13 -07:00