Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lajos Molnar
c398f175cd Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev 2014-11-22 05:59:31 +00:00
Eino-Ville Talvala
e289082a70 am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'dfa99f63677c238453293f48b62b4fffcc101262':
  Camera: Add new capability flags as system features as well
 2014-11-22 05:00:48 +00:00
Eino-Ville Talvala
dfa99f6367 Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 2014-11-22 04:57:49 +00:00
Jeff Brown
3d110b2391 Make WallpaperService watch the actual display state. 
Bug: 18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
 2014-11-22 03:25:39 +00:00
Olawale Ogunwale
fe8be26d6a am 1da25f93: am 50884b5b: am f1058308: Merge "Add window to child window list with correct order" 
* commit '1da25f9331892be262289e3ce00dde23e685db03':
  Add window to child window list with correct order
 2014-11-22 02:48:23 +00:00
RoboErik
74086d44ff am a08adb24: Fix binder equality check 
* commit 'a08adb2437f641087e01436293736be235fe1fda':
  Fix binder equality check
 2014-11-22 02:43:31 +00:00
Olawale Ogunwale
1da25f9331 am 50884b5b: am f1058308: Merge "Add window to child window list with correct order" 
* commit '50884b5b65516a9f2233d9e8349c41843f137dca':
  Add window to child window list with correct order
 2014-11-22 02:42:34 +00:00
Sanket Padawe
d96712d05d am b3498581: am 8e2e6683: am ab4a940a: Merge "Make default carrier name string look better." into lmp-mr1-dev 
* commit 'b34985813d1e186dd96f6cca86ae748a4758e135':
  Make default carrier name string look better.
 2014-11-22 02:42:15 +00:00
Olawale Ogunwale
50884b5b65 am f1058308: Merge "Add window to child window list with correct order" 
* commit 'f1058308c62f297c5bca9e9baf8451efeb200805':
  Add window to child window list with correct order
 2014-11-22 02:34:01 +00:00
Sanket Padawe
b34985813d am 8e2e6683: am ab4a940a: Merge "Make default carrier name string look better." into lmp-mr1-dev 
* commit '8e2e6683e3f4830a45474a70f5043f1fcd84f890':
  Make default carrier name string look better.
 2014-11-22 02:33:13 +00:00
RoboErik
a08adb2437 Fix binder equality check 
Forgot to call .asBinder() before checking binders for equality. This
fixes a memory leak caused by the system holding on to binders.

bug:18049316
Change-Id: I43a9f4163b28cf1a77e59c3e7bade32bd2ef1c1a
 2014-11-21 18:28:18 -08:00
Olawale Ogunwale
f1058308c6 Merge "Add window to child window list with correct order" 2014-11-22 02:12:49 +00:00
Ian Rogers
705e604ad8 am fa1ae7db: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 
* commit 'fa1ae7dbb81ea6122170e119c7b81ed0996cf36e':
 2014-11-22 01:23:58 +00:00
Chih-hung Hsieh
3643f92882 am 29d1b12d: am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 
* commit '29d1b12ddae8950ee7d2a8f31a040340185a331e':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
 2014-11-22 01:23:53 +00:00
John Reck
d38c18ca00 am f2d270a9: am 39a57cc2: (-s ours) am ad938797: Merge "Revert "Frameworks/base: Unused parameters in hwui"" 
* commit 'f2d270a91460e0997fe33275c8ea113bdbcf5db7':
  Revert "Frameworks/base: Unused parameters in hwui"
 2014-11-22 01:23:49 +00:00
John Reck
82cb15199a am cbee971a: resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp 
* commit 'cbee971a105adcf071b89838818f31b37388e9b9':
  It's super critical to call nStart
 2014-11-22 01:14:12 +00:00
Ian Rogers
fa1ae7dbb8 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-11-22 01:09:59 +00:00
Chih-hung Hsieh
29d1b12dda am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 
* commit '05f7c39eb45854f8d2a8a2aabb9ad9a4f9b867c1':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
 2014-11-22 01:08:42 +00:00
John Reck
cbee971a10 resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp 
Change-Id: I86b78ada4f30c23ae1232ac5a509986d5b8dc546
 2014-11-21 17:07:17 -08:00
John Reck
f2d270a914 am 39a57cc2: (-s ours) am ad938797: Merge "Revert "Frameworks/base: Unused parameters in hwui"" 
* commit '39a57cc20e540708b5c6c2b3bfa6971ebade0a11':
  Revert "Frameworks/base: Unused parameters in hwui"
 2014-11-22 01:06:03 +00:00
Dianne Hackborn
b2411f77ca Final resource IDs. 
Change-Id: Ie4b811f2a914191dded8de1b3d6321cff4db882c
 2014-11-21 17:04:53 -08:00
Andreas Gampe
0da62bafee Merge "Revert "resolved conflicts for merge of 220c3f4f to master"" 2014-11-22 00:35:26 +00:00
Andreas Gampe
64bb413a66 Revert "resolved conflicts for merge of 220c3f4f to master" 
Reverted as hwui doesn't agree.

This reverts commit 8a902d9f24.

Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
 2014-11-22 00:35:09 +00:00
Chih-hung Hsieh
05f7c39eb4 am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 
* commit 'fc4a7538a65449428e9d321deb6a413e19461c6c':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
 2014-11-22 00:31:07 +00:00
Joe Fernandez
0c7d2d2fa8 am 85f463c5: am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit '85f463c5b59350fa4c4a05007f8a7b65a9a89da3':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-22 00:30:37 +00:00
Scott Rowe
9e9d1cd3ff am a505d0be: am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit 'a505d0becb5f2d4fafca543eaa7a390605951974':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-22 00:30:32 +00:00
Joe Fernandez
85f463c5b5 am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources 
* commit 'fbdfdef43da5d946e8559d47d8bd79db0bceedb1':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
 2014-11-22 00:25:13 +00:00
Scott Rowe
a505d0becb am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 
* commit '63108ee3623cc2b57c3a0a2e730dc9bf5c06c825':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-22 00:24:51 +00:00
Chih-hung Hsieh
fc4a7538a6 Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 2014-11-22 00:24:39 +00:00
Chris Craik
b5a5435a77 Improve DisplayList state output 
bug:17991451

Log hardware layers and shadow casting

Change-Id: I2ae40f270d18f5b2a5af985513e0f5e8841216c2
 2014-11-21 16:23:00 -08:00
Junda Liu
38531581fc Add hasMatchedTetherApnSetting to telmgr API. 
Bug: b/18158411
Change-Id: Id1285b79194ad21fb728fd18fb09026e51354656
 2014-11-21 16:21:30 -08:00
John Reck
39a57cc20e am ad938797: Merge "Revert "Frameworks/base: Unused parameters in hwui"" 
* commit 'ad9387974b02528ff0366134a3740d66fb0b1cd5':
  Revert "Frameworks/base: Unused parameters in hwui"
 2014-11-22 00:14:53 +00:00
John Reck
ad9387974b Merge "Revert "Frameworks/base: Unused parameters in hwui"" 2014-11-22 00:10:45 +00:00
John Reck
8b59a528b5 Revert "Frameworks/base: Unused parameters in hwui" 
This reverts commit 42ddc18d10.

Change-Id: I3574a936a39a96314db6437d0a1eb58d260d893d
 2014-11-22 00:10:02 +00:00
Winson Chung
4a7b19f18a am 161b51ba: am 207356ef: am 71113e43: Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev 
* commit '161b51ba065fb54c3b983db61eb3dc48a0e0a855':
  Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
 2014-11-22 00:00:25 +00:00
Jeff Sharkey
0970be3923 am 4524e06d: am 571dc539: am 17400627: Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev 
* commit '4524e06de7bfe57ffbde1ee5e7d647a885383686':
  Avoid NPE in forceStopPackageLocked().
 2014-11-22 00:00:20 +00:00
Craig Mautner
439c9f39e9 am c8d97850: am a673263d: am 0a398d7b: Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev 
* commit 'c8d97850a8a3bc3bad882067fef60608bdbf7228':
  Treat screen-on while pausing as pause timeout.
 2014-11-22 00:00:10 +00:00
ztenghui
2086293e60 am bb97b311: am 21bc2e3e: am cb721bf6: Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev 
* commit 'bb97b311ea46d22864f40578d9ef37ccf0a28274':
  Supporrt tapas build for vector tests
 2014-11-22 00:00:06 +00:00
Amith Yamasani
9d4e6a8355 am 1f26bf6b: am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '1f26bf6bfd683b840f688b41d285fd9c942e6ed5':
  Different messages when wiping user and not device
 2014-11-22 00:00:01 +00:00
Chris Craik
6d118e0241 am 90102e10: (-s ours) am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '90102e10093f7bb658fb7dd6c30a1efd5380c6d1':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 23:58:29 +00:00
Andreas Gampe
8a902d9f24 resolved conflicts for merge of 220c3f4f to master 
Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e
 2014-11-21 15:51:04 -08:00
Amith Yamasani
da0b168254 Fix parsing bug that affects reading back guest restrictions 
Now it remembers guest default restrictions across reboots.

Bug: 18477780
Change-Id: I3a2c0d47825c8fcfc69edf791ddd6329e23ee04b
 2014-11-21 15:50:43 -08:00
Sanket Padawe
8e2e6683e3 am ab4a940a: Merge "Make default carrier name string look better." into lmp-mr1-dev 
* commit 'ab4a940a8ae4a5fb63a84fa51527b7703e7bfc88':
  Make default carrier name string look better.
 2014-11-21 23:37:57 +00:00
John Reck
08372601ab am 418c8549: Merge "It\'s super critical to call nStart" into lmp-mr1-dev 
* commit '418c8549dca8bff8c38c67ed7f7d7fbbaccd4e71':
  It's super critical to call nStart
 2014-11-21 23:37:52 +00:00
Sanket Padawe
ab4a940a8a Merge "Make default carrier name string look better." into lmp-mr1-dev 2014-11-21 23:33:26 +00:00
John Reck
418c8549dc Merge "It's super critical to call nStart" into lmp-mr1-dev 2014-11-21 23:32:08 +00:00
Winson Chung
161b51ba06 am 207356ef: am 71113e43: Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev 
* commit '207356efae596b3860a384ced5f369462ce342d7':
  Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
 2014-11-21 23:24:14 +00:00
Jeff Sharkey
4524e06de7 am 571dc539: am 17400627: Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev 
* commit '571dc539a120f234ecfc847edf57edc7762ab862':
  Avoid NPE in forceStopPackageLocked().
 2014-11-21 23:24:08 +00:00
Dianne Hackborn
d052a9416a Work on issue #18486438: Reduce size of bugreport output 
Reduce how much stuff ProcessStats spews, and do collapsing of
repeated intent filter targets when dumping IntentResolvers.

Also add to pm's checkout output to include shared user ids,
and fix output formatting in a few places.

Change-Id: Ic9fc6731f0439101ba9343535e66cdbbad47e291
 2014-11-21 15:23:13 -08:00
Yigit Boyar
24c2a7e736 Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar 
Bug: 18440924
Change-Id: I7221532d003fd0208cf91a5ffd9be24a7695bd3d
 2014-11-21 15:19:43 -08:00