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

174905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
b80417303f Import translations. DO NOT MERGE 
Change-Id: I99aa8bb6f0cd916b4ea4e4621a175cad9d43c3af
Auto-generated-cl: translation import
 2014-11-24 06:29:27 -08:00
Robin Lee
0d5ccb7378 Ensure that private key is PKCS#8-encoded 
getEncoded() is not requred to return a PKCS#8-encoded result.

Bug: 15065444
Change-Id: I1278ff9ffffe5887f149bae9288a174beed5f86a
 2014-11-24 10:10:39 +00:00
Elliott Hughes
476edb5701 am ee46d162: am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 
* commit 'ee46d1621f817d626e8dd42e9ffe7051f4a829eb':
  We HAVE_LITTLE_ENDIAN.
 2014-11-22 08:04:38 +00:00
Elliott Hughes
ee46d1621f am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 
* commit '08e2fd7238c50b5d06af41bc944ee08acb023d51':
  We HAVE_LITTLE_ENDIAN.
 2014-11-22 07:56:46 +00:00
Elliott Hughes
08e2fd7238 am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 
* commit 'ff4dd15cd024f72cbd2b6d547356de030b2dd71c':
  We HAVE_LITTLE_ENDIAN.
 2014-11-22 07:50:58 +00:00
Elliott Hughes
ff4dd15cd0 Merge "We HAVE_LITTLE_ENDIAN." 2014-11-22 07:47:27 +00:00
Elliott Hughes
9d074a1fb7 We HAVE_LITTLE_ENDIAN. 
Change-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4
 2014-11-21 23:36:45 -08: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
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
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
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 8a902d9f24e83c87b054adb5836b4a5b8a257be9.

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
Chih-hung Hsieh
fc4a7538a6 Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 2014-11-22 00:24:39 +00: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 42ddc18d108f789705ad4eb697ce9599ad322507.

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
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
Winson Chung
207356efae 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 '71113e43e768d973b3721f8fac9f9654ed159911':
  Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
 2014-11-21 23:19:38 +00:00
Jeff Sharkey
571dc539a1 am 17400627: Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev 
* commit '1740062728bf66f416b47b0c7f7d89c8d6b77504':
  Avoid NPE in forceStopPackageLocked().
 2014-11-21 23:19:30 +00:00
Winson Chung
71113e43e7 Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev 2014-11-21 23:15:04 +00:00
Jeff Sharkey
fa6547f6c0 am 79ef5ef7: am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit '79ef5ef7a58baf17f7c3522a5aeb041f5206c32a':
  Lightweight checkin output for network stats.
 2014-11-21 23:14:12 +00:00
Jeff Sharkey
1740062728 Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev 2014-11-21 23:14:04 +00:00
Jeff Brown
fd72097736 am 4c9041cf: am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '4c9041cf837cda13c749b148661d18c3fab0fbd6':
  Support keeping activities resumed while dozing.
 2014-11-21 23:13:49 +00:00
Jinsuk Kim
c099f7fbad am 6d274dc2: am c86f09d7: am 2dafe666: Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev 
* commit '6d274dc2a5afd6c8d9e1c44663781a14924d739d':
  CEC: Enable log for non-user builds
 2014-11-21 23:13:44 +00:00
Yigit Boyar
244b5d01e3 am f532871e: am 1bbaeaa4: am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit 'f532871ec4cecd63e760706fbb8871bc1c65583b':
  Improve GridLayout's weight calculations
 2014-11-21 23:13:16 +00:00
Alan Viverette
72807b2363 am d7c5acdf: am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error" 
* commit 'd7c5acdf1c98bb92ab05a524375e602296a24422':
  Fix error overwriting when restoring error
 2014-11-21 23:13:08 +00:00