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

100840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
7031ff68bb Prettify display lists logging 
This change makes it a lot easier to see the tree structure.

Change-Id: I4969abd1eb010f1d529671f8d86dc4c930be24f6
 2013-02-22 11:51:15 -08:00
Ian Rogers
7508039d66 am 631bc614: am 08a92a33: Merge "Account malloc mmaped pages as native heap." 
* commit '631bc614f52015a2f068c2e66030e9aa47508fb5':
  Account malloc mmaped pages as native heap.
 2013-02-22 11:04:16 -08:00
Ian Rogers
631bc614f5 am 08a92a33: Merge "Account malloc mmaped pages as native heap." 
* commit '08a92a335fd84ca427b55c6c2d39f72970d82b76':
  Account malloc mmaped pages as native heap.
 2013-02-22 10:53:59 -08:00
Craig Mautner
12e563fff9 Merge "Create rotation animation modes." 2013-02-22 18:51:21 +00:00
Craig Mautner
3c1743705c Create rotation animation modes. 
Allow fullscreen windows to specify crossfade or jumpcut animations
that override the default rotation animation. Only if the incoming
and outgoing topmost windows are fullscreen and both specify the
same animation to use.

Fixes bug 8182773.

Change-Id: I6b3c0020d7bd2cdfba5c66189e114ec62cd54fcf
 2013-02-22 10:44:52 -08:00
Irfan Sheriff
d99375528c Merge "Clean up scan handling" 2013-02-22 18:40:24 +00:00
Robert Greenwalt
5a6bdc46e2 Improve ConnectivityManager docs 
Also fix some permission problems.
bug:5738328

Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf
 2013-02-22 10:39:20 -08:00
Derek Sollenberger
bc340d03c3 Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" 2013-02-22 18:39:13 +00:00
Daniel Sandler
9d81e32455 Merge "Make QUICK_CLOCK work on tablets." 2013-02-22 18:19:35 +00:00
Dirk Dougherty
e08f1c0251 am 531a5996: am 82f810f3: am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo. 
* commit '531a599660cde37fd7c50969b8f4abdbe5a0baa7':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:18:30 -08:00
Dirk Dougherty
531a599660 am 82f810f3: am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo. 
* commit '82f810f3d4e70c264cb81c0cb6caaec2e864ebd0':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:15:52 -08:00
Dirk Dougherty
82f810f3d4 am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo. 
* commit 'bc1a863f687a2bbe9ae71ed22a3ebfaf7f8bbd26':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:12:14 -08:00
Dirk Dougherty
bc1a863f68 am 094023a7: am 47dae077: Doc change: Update DC image, fix typo. 
* commit '094023a7f155270a0f4ee54b8dd8282d4ffbea23':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:08:19 -08:00
Dirk Dougherty
094023a7f1 am 47dae077: Doc change: Update DC image, fix typo. 
* commit '47dae0771cb0db98ff829e19bf505f8628745878':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:06:09 -08:00
Adam Koch
9bceb5603e Displaying Bitmaps Efficiently Training - Update sample app zip 
Change-Id: I97faf4bcf5c46083fdbe2bb094be9a3bcfff0bd8
 2013-02-22 13:03:06 -05:00
Ian Rogers
08a92a335f Merge "Account malloc mmaped pages as native heap." 2013-02-22 18:02:40 +00:00
Dirk Dougherty
47dae0771c Doc change: Update DC image, fix typo. 
Change-Id: Ifa68c9dd457cc8deb65e63cac54082ce082fa18d
 2013-02-22 09:54:45 -08:00
Ian Rogers
afc10e174d Account malloc mmaped pages as native heap. 
Currently when malloc uses a page rather than brk the heap gets accounted as
ashmem memory. Previously the memory would be accounted as unknown but since
[1] it gets accounted as ashmem. This change makes the accounting see this
memory as being native, ie the same kind of memory we associate with brk.

[1] https://android-review.googlesource.com/#/c/49583/3

Change-Id: I6f496cfeb590268d41d8e047b12cd5c90359e2b0
 2013-02-22 09:40:58 -08:00
Baligh Uddin
5d5ac5bb0a Import translations. DO NOT MERGE 
Change-Id: I26214599db1cab9d2c5847860d43e008d0e463ab
Auto-generated-cl: translation import
 2013-02-22 09:25:20 -08:00
Irfan Sheriff
bcc97ca43a Clean up scan handling 
Remove obsolete active/passive scan handling - drivers always
do active scan.

Also, remove AP_SCAN hack for preventing connections and use
the TYPE=ONLY scan.

Bug: 8158647
Change-Id: I8f70e19219ad789b7501a40529bcd6b6524739e8
 2013-02-22 09:23:55 -08:00
Derek Sollenberger
25bea647c2 Merge remote-tracking branch 'goog/master-chromium' into 'goog/master' 
bug: 6906025
Change-Id: Ica9524b017abb6124f6cd0e11fd36c64f2cee68a
 2013-02-22 09:51:59 -05:00
Ben Murdoch
5875cc6b27 am b8495145: Merge "Update WebView.PictureListener.onNewPicture to pass null picture." 
* commit 'b84951451c35813ccf8aefdb12f5092926785fd4':
  Update WebView.PictureListener.onNewPicture to pass null picture.
 2013-02-22 04:53:24 -08:00
Ben Murdoch
b84951451c Merge "Update WebView.PictureListener.onNewPicture to pass null picture." 2013-02-22 12:43:42 +00:00
Jesse Hall
cbd3789801 am ab10f3c5: Merge "Restore a mistakenly-removed null check" 
* commit 'ab10f3c5b939f3d7afe6d5561d761fc5299572bc':
  Restore a mistakenly-removed null check
 2013-02-21 22:10:15 -08:00
Jesse Hall
ab10f3c5b9 Merge "Restore a mistakenly-removed null check" 2013-02-22 06:05:40 +00:00
Craig Mautner
be88cb1d6c am 47e8074d: Merge "Update histories simultaneously." 
* commit '47e8074d401b0a2c38b376329bfe8bf1f62da23b':
  Update histories simultaneously.
 2013-02-21 20:06:14 -08:00
Craig Mautner
47e8074d40 Merge "Update histories simultaneously." 2013-02-22 04:02:24 +00:00
Craig Mautner
b44de0d910 Update histories simultaneously. 
In moveTaskToBackLocked calls that used mHistory were being made
between the times that mTaskHistory and mHistory were modified. This
caused an inconsistent state that led to Windows arranged out of
order. Updating both history stacks at the same time fixes this.

Fixes bug 8244261.

Change-Id: I9669762ad39b06ab6d401122702b74969d4dc658
 2013-02-21 20:00:58 -08:00
Chris Craik
94b97b38b7 am eab51de4: Merge "Fix clipping and stencil layer issues" 
* commit 'eab51de4de88219256260fe26e2018a6234ef83b':
  Fix clipping and stencil layer issues
 2013-02-21 19:31:17 -08:00
Chris Craik
eab51de4de Merge "Fix clipping and stencil layer issues" 2013-02-22 03:28:06 +00:00
Kenny Root
4e89d1a9b2 am 893df066: am 8dda0956: am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read" 
* commit '893df066bbd156b05171e68204a407a212c507e9':
  StreamingZipInflater: fix mmap'd end of read
 2013-02-21 16:28:14 -08:00
Kenny Root
893df066bb am 8dda0956: am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read" 
* commit '8dda0956b6565a958989af44e885b94dc9bfc9bd':
  StreamingZipInflater: fix mmap'd end of read
 2013-02-21 16:24:41 -08:00
Kenny Root
8dda0956b6 am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read" 
* commit '49999acb049e09f99135e412cbb10d7367d2d607':
  StreamingZipInflater: fix mmap'd end of read
 2013-02-21 16:21:05 -08:00
Chris Craik
b98a016c67 Fix clipping and stencil layer issues 
bug:8235699

Ensure rectangle clipping operations disable deferring when necessary
(i.e., when the op might create a non-rect region), including in
DisplayList::setViewProperties

Additionally, makes clipping with a kUnion always use a region, for
consistency with software rendering

Change-Id: I6730f1a80250bcf3f91cd4afde646d470a12dbc2
 2013-02-21 16:12:00 -08:00
Michael Wright
fe98be7533 am 65b0052a: Merge "Remove SurfaceControl.setPosition(int, int)" 
* commit '65b0052a7473b73a18aef73460c9ebec77a2c2a0':
  Remove SurfaceControl.setPosition(int, int)
 2013-02-21 16:09:05 -08:00
Kenny Root
49999acb04 Merge "StreamingZipInflater: fix mmap'd end of read" 2013-02-22 00:05:36 +00:00
Michael Wright
65b0052a74 Merge "Remove SurfaceControl.setPosition(int, int)" 2013-02-22 00:05:10 +00:00
Michael Wright
b7b696ee71 Remove SurfaceControl.setPosition(int, int) 
This was just casting and calling the float version anyways, which Java does
automatically.

Bug: 8153162
Change-Id: If2f99995ff38b92e40777896baf6694786031898
 2013-02-21 15:52:50 -08:00
Christopher Tate
835aac396c am ab6b77fd: Merge "Be cool in backup/restore of apps that can\'t touch external storage" 
* commit 'ab6b77fd85979212299d8aef0b2c83c005b13abc':
  Be cool in backup/restore of apps that can't touch external storage
 2013-02-21 15:50:16 -08:00
Christopher Tate
ab6b77fd85 Merge "Be cool in backup/restore of apps that can't touch external storage" 2013-02-21 23:45:02 +00:00
Christopher Tate
5cb5c337d5 Be cool in backup/restore of apps that can't touch external storage 
Bug: 8241337
Change-Id: I23f6eeba8448b234a7b18ce50d2ced2ba54b4ebd
 2013-02-21 15:43:52 -08:00
Mathias Agopian
51eb127a17 am e4d3b06b: Merge "get rid of uses of getISurfaceTexture" 
* commit 'e4d3b06b6ddb055739b8b2aa82ffc7840588253a':
  get rid of uses of getISurfaceTexture
 2013-02-21 15:24:21 -08:00
Dirk Dougherty
4d149f58f5 am 6588a52e: am 95925649: am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit '6588a52ecd56a477bbd1dc5ff37074615a278292':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 15:24:18 -08:00
Wink Saville
c7dcdfe872 am fb053cde: am f7bf667d: am b5a1ce2f: Merge "Allow three digit phone numbers" 
* commit 'fb053cde74483f901462b5a034dd2be90a5af0da':
  Allow three digit phone numbers
 2013-02-21 15:24:16 -08:00
Mathias Agopian
e4d3b06b6d Merge "get rid of uses of getISurfaceTexture" 2013-02-21 23:21:51 +00:00
Dirk Dougherty
6588a52ecd am 95925649: am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit '959256498ab254a59617432f31205e000f3d8a8c':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 15:20:05 -08:00
Wink Saville
fb053cde74 am f7bf667d: am b5a1ce2f: Merge "Allow three digit phone numbers" 
* commit 'f7bf667d4a5e8e3fca75640f6352724826705128':
  Allow three digit phone numbers
 2013-02-21 15:19:53 -08:00
Jesse Hall
aa70f2217c Restore a mistakenly-removed null check 
Passing null to camera.setPreviewDisplay() needs to work; this
restores the behavior from before the Surface/SurfaceControl
refactoring.

Bug: 8225538
Change-Id: Ib73bfa9fe53457a41a69b7fe5dfff3a3aa260f52
 2013-02-21 15:06:27 -08:00
Dirk Dougherty
959256498a am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit '9de1383960314eed43c4df1c0bcc82cd883bd76f':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:29:33 -08:00
Dirk Dougherty
9de1383960 am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit 'd886d12854011894d9b5f4155179c11e571a1aee':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:25:37 -08:00