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

106036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
60c2772ca7 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I03f18d4939d298225e8954dfff6dc9cdbe71b8c7
 2013-07-01 07:42:58 -07:00
The Android Automerger
84791f01f5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-01 05:55:32 -07:00
Joe Malin
653efe738e am 6635e269: am e9df511e: DOC: Sync Adapters Android Training 
* commit '6635e26991e27d8cf28a04e9aff381511492b113':
  DOC: Sync Adapters Android Training
 2013-06-30 09:20:56 -07:00
Joe Malin
6635e26991 am e9df511e: DOC: Sync Adapters Android Training 
* commit 'e9df511e2018eb6a296408d09e355c6f2c77ae59':
  DOC: Sync Adapters Android Training
 2013-06-30 09:17:51 -07:00
The Android Automerger
4c97ad0fc5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-30 05:55:29 -07:00
Joe Malin
e9df511e20 DOC: Sync Adapters Android Training 
Change-Id: Ia857483e1e530436d3c0b1c99697bd52eaa37903
 2013-06-29 21:46:59 -07:00
Elliott Hughes
1a6fe26d1b am c63c0682: am e3b94f05: Merge "Track libcore API change." 
* commit 'c63c068228267b41fb106e22a6914ab19da9e5bc':
  Track libcore API change.
 2013-06-28 18:13:29 -07:00
Elliott Hughes
c63c068228 am e3b94f05: Merge "Track libcore API change." 
* commit 'e3b94f05b8be2b6305cbee77c23b7f7599bfcff7':
  Track libcore API change.
 2013-06-28 18:11:10 -07:00
Elliott Hughes
e3b94f05b8 Merge "Track libcore API change." 2013-06-29 01:08:25 +00:00
Elliott Hughes
97c538d5f3 Track libcore API change. 
Bug: 3484927
Change-Id: If49d0389e4ecb826052e168e070b673894d91318
 2013-06-28 18:03:46 -07:00
Elliott Hughes
b8292830f7 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp 
Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6
 2013-06-28 16:50:13 -07:00
Elliott Hughes
a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master 
Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74
 2013-06-28 16:41:19 -07:00
Elliott Hughes
fca0f92e0a Merge "Switch frameworks/base over from @hidden Charsets to public StandardCharsets." 2013-06-28 23:31:35 +00:00
Elliott Hughes
d1411efee3 am 324993ab: am 5216f11e: Merge "Track libcore API update." 
* commit '324993abed48843da1cb63063668147151e4db5c':
  Track libcore API update.
 2013-06-28 16:26:08 -07:00
Elliott Hughes
d396a448b2 Switch frameworks/base over from @hidden Charsets to public StandardCharsets. 
Bug: 3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
 2013-06-28 16:24:48 -07:00
Elliott Hughes
324993abed am 5216f11e: Merge "Track libcore API update." 
* commit '5216f11e462b9f17704c0ac9e193d2149f3fa755':
  Track libcore API update.
 2013-06-28 16:23:47 -07:00
Elliott Hughes
5216f11e46 Merge "Track libcore API update." 2013-06-28 23:17:20 +00:00
Elliott Hughes
0e88a95480 Track libcore API update. 
Bug: 3484927
Change-Id: I77c22d3da7b70d3dae4cf6c1903add948ae39406
 2013-06-28 16:08:02 -07:00
Elliott Hughes
5d2d22221a am ce566b50: am ee66531f: Merge "Track libcore API update." 
* commit 'ce566b5068bb73b7e379bb40c3eb74922000bbd9':
  Track libcore API update.
 2013-06-28 16:01:51 -07:00
Elliott Hughes
ce566b5068 am ee66531f: Merge "Track libcore API update." 
* commit 'ee66531f2fa2b6aaa5ca064062f5e8d50b64ff44':
  Track libcore API update.
 2013-06-28 15:58:45 -07:00
Elliott Hughes
ee66531f2f Merge "Track libcore API update." 2013-06-28 22:56:03 +00:00
Elliott Hughes
6859af17ce Track libcore API update. 
Bug: 3484927
Change-Id: I684d724000d09a52c840076fab5985242c77c908
 2013-06-28 15:28:00 -07:00
Romain Guy
d971caa5d5 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-28 14:37:24 -07:00
Amith Yamasani
937db2d48f When a new user AID is generated, dump it to dropbox 
Bug: 9595851
Change-Id: I6fde757eed84d7914db180e80c9d68448b3e5780
 2013-06-28 14:37:13 -07:00
Romain Guy
f63fdf8680 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-28 14:36:58 -07:00
Robert Greenwalt
46bb6d6cb7 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-28 14:36:40 -07:00
Elliott Hughes
34ba52a060 am a9510297: am 505974eb: Merge "Track libcore API update." 
* commit 'a9510297a656c574d063b299f044bc9893af7724':
  Track libcore API update.
 2013-06-28 13:09:58 -07:00
Elliott Hughes
a9510297a6 am 505974eb: Merge "Track libcore API update." 
* commit '505974eb736218d40b1d648ea4af548167a381b1':
  Track libcore API update.
 2013-06-28 13:07:21 -07:00
Elliott Hughes
505974eb73 Merge "Track libcore API update." 2013-06-28 20:04:29 +00:00
Romain Guy
55e789dbc7 am ed96349a: am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev 
* commit 'ed96349a43133625d76fe7ba52ee4893c741ec41':
  Fix out of range glCopyTexImage2D Bug #9425270
 2013-06-28 11:10:59 -07:00
Romain Guy
ed96349a43 am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev 
* commit '3d1b158e705f1ba83ac42dfe1aeaf25201638ef6':
  Fix out of range glCopyTexImage2D Bug #9425270
 2013-06-28 11:08:21 -07:00
Romain Guy
3d1b158e70 Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev 2013-06-28 18:05:00 +00:00
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