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

106083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Open Source Project
bfc53ab2de Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I9db90765647d0218de569565d7a23ab3c12ca044
 2013-06-25 16:12:06 -07:00
John Reck
52dbdbf2d1 am 9d2b0dbf: am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread" 
* commit '9d2b0dbf67844ead1a0aeb22e1e3097d2ec60171':
  Fix deadlock of WebViewCoreThread
 2013-06-25 15:34:16 -07:00
John Reck
9d2b0dbf67 am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread" 
* commit '12c4c0e45b12be18005f0ad2af2433e34dcb1a9f':
  Fix deadlock of WebViewCoreThread
 2013-06-25 15:31:39 -07:00
John Reck
12c4c0e45b Merge "Fix deadlock of WebViewCoreThread" 2013-06-25 22:28:02 +00:00
Svetoslav
8d41901e66 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-25 15:12:34 -07:00
Svetoslav
0cb0a37f1c 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.
 2013-06-25 15:01: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
Christopher Tate
3c0cd0b540 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
 2013-06-24 16:08:15 -07:00
Christopher Tate
347182386c 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
 2013-06-24 16:05:49 -07:00
Christopher Tate
3e7d034439 Merge "Avoid adding FORWARD_LOCK flag to an updated system app" 2013-06-24 23:02:00 +00:00
Jean-Baptiste Queru
5a0f665244 am 5b3afe3a: am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout" 
* commit '5b3afe3a84cad94642360df01c39ebb2a3ee14ba':
  Lockscreen : Reference correct layout
 2013-06-24 15:13:28 -07:00
The Android Automerger
2184e3e31b merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-24 14:55:07 -07:00
The Android Automerger
1ff1cd1b96 Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD 2013-06-24 14:41:52 -07:00
Jean-Baptiste Queru
5b3afe3a84 am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout" 
* commit '4be48d436bb2d8d2207b317f9a826c27671b6d4b':
  Lockscreen : Reference correct layout
 2013-06-24 14:27:28 -07:00
Jean-Baptiste Queru
4be48d436b Merge "Lockscreen : Reference correct layout" 2013-06-24 21:15:45 +00:00
Danesh Mondegarian
034ed8f94b Lockscreen : Reference correct layout 
Include correct layout for portrait.

Change-Id: I6de511357aec0f4364cd68c3ed740c7d4f47379d
 2013-06-24 16:00:35 -04:00
Joe Malin
602bc43266 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
 2013-06-24 12:12:50 -07: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
66e9a00977 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.
 2013-06-24 01:45:36 -07: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
0d4adbe0a3 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.
 2013-06-23 19:53:00 -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
83006f5197 am aa837ded: am 86c9d47c: update homepage carousel for jelly bean 3.0 
* commit 'aa837dedf85eabde76cf8d5ec57e42f78832e8a6':
  update homepage carousel for jelly bean 3.0
 2013-06-21 20:51:37 -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
be4673494d am c2d92db8: am bcd6f76a: Merge "typo" into jb-mr2-dev 
* commit 'c2d92db8c0ca3d9d045f5f710f4d90db8684b439':
  typo
 2013-06-21 20:33:24 -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
73c1882fd8 am 90e2e8db: am 4129cfe1: Merge "add jb-mr2 api overview" into jb-mr2-dev 
* commit '90e2e8db2f74b25cff0cfe7e59f88a37d49da3a8':
  add jb-mr2 api overview
 2013-06-21 20:28:09 -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
30c8973f66 am 75c59fb9: am dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev 
* commit '75c59fb9d9a1408146165300eae0899a965897bf':
  Doc change: new Bluetooth LE doc
 2013-06-21 16:31:41 -07:00