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

106209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
5931afdc0f Track libcore API update. 
Bug: 3484927
Change-Id: I22fc7e003c3483a20988e91d2b8824626ec022b1
 2013-06-28 10:55:14 -07:00
Amith Yamasani
3f0decd7df am 16a2268f: am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev 
* commit '16a2268f8091e1b27cb1b1343d992c7509a2506e':
  When a new user AID is generated, dump it to dropbox
 2013-06-28 10:14:30 -07:00
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
Kenny Root
67f7d8fbd5 am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory" 
* commit '6c042b6d678edea0f936da994f85ba62f9a1950e':
  Add ALPN support to SSL socket factory
 2013-06-27 14:55:41 -07:00
Yorke Lee
11b249f641 am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev 
* commit 'f6ec3048546cf8f2821f8a67645df3bab243e591':
  Rename Google Talk to Hangouts in framework
 2013-06-27 14:52:37 -07:00
Romain Guy
dbfb2ab4a7 am 93d46952: am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270 
* commit '93d46952db60090ae22bc8197659a06ae23cb58b':
  Recreate TextureView's display list on attach Bug #9425270
 2013-06-27 14:52:33 -07:00
Kenny Root
6c042b6d67 am a5a2de55: Merge "Add ALPN support to SSL socket factory" 
* commit 'a5a2de55082b1f2a9ec0b99962a88063ac6d1bbf':
  Add ALPN support to SSL socket factory
 2013-06-27 14:52:17 -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
Kenny Root
a5a2de5508 Merge "Add ALPN support to SSL socket factory" 2013-06-27 21:25:24 +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
The Android Open Source Project
1559d13184 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I8a1c9c4b0a3730977c0a34fcd55d41f84999b485
 2013-06-26 12:33:35 -07:00
The Android Automerger
3d5c1091cf merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-26 12:17:18 -07:00
Robert Greenwalt
c869696ef3 am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev 
* commit '65f7a95fc4c06127e7372bcb0d14e561cc23dd80':
  Fix power issues around wifi scans.
 2013-06-26 10:55:00 -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
Kenny Root
100d729026 Add ALPN support to SSL socket factory 
This adds the ability to use Application-Layer Protocol Negotiation
(ALPN) through the SSLCertificateSocketFactory. ALPN is essentially
like Next Protocol Negotiation (NPN) but negotiation is done in the
clear. This allows the use of other protocols on the same port (e.g.,
SPDY instead of HTTP on port 80).

Change-Id: Ie62926b455e252c4c98670bbbecc1eb5c6f13990
 2013-06-26 10:35:39 -07: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
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