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

122509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
2f756cbb5a Remove unused field from AssetManager. 
This field was introduced in commit 4bdd33b81a17 but wasn't
used there (or since).

Change-Id: I0615e98b8990d42da6b85f8094ab19eb0465fd9e
 2014-01-22 11:09:09 +00:00
quddusc
afc4deb7b3 am ddef0ec9: am fbb2a975: am c99557c9: am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit 'ddef0ec94b01b18f4452dea7ed98a4ff5184e49b':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-22 05:56:16 +00:00
quddusc
ddef0ec94b am fbb2a975: am c99557c9: am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit 'fbb2a9753176af340d18fa6b72a1e0e46c7c3c6f':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-22 05:50:56 +00:00
quddusc
fbb2a97531 am c99557c9: am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit 'c99557c92c9bebc089c4eb7bf37a63dca8f28a6a':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-22 05:46:32 +00:00
quddusc
c99557c92c am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit '0cb965a69aac9c2a83798960a0efeaa6e596e445':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-21 20:13:48 -08:00
quddusc
0cb965a69a am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit '5020a8736f3319d295d31bed421f837788878451':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-22 04:10:13 +00:00
quddusc
5020a8736f Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 2014-01-22 04:07:18 +00:00
quddusc
1dff746b02 cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da 
Change-Id: I40b79aee2302f1e32a9e8bc11d0b0415dcbe7705
 2014-01-21 18:53:57 -08:00
Scott Main
4dc4e848fb am 52288441: am ae6531d6: am 69edcce7: am d9d41f2d: am fbdcf317: fix code typo 
* commit '52288441428d68337e01def025e540bc8ed968f6':
  fix code typo
 2014-01-22 02:03:05 +00:00
Scott Main
5228844142 am ae6531d6: am 69edcce7: am d9d41f2d: am fbdcf317: fix code typo 
* commit 'ae6531d6b57c90d2da61775efddc2e175148637a':
  fix code typo
 2014-01-22 02:00:08 +00:00
Christopher Tate
79bea304ea am 46c95dfc: am b450505c: am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted" 
* commit '46c95dfc1009607184ea023921e1f262f38cd61e':
  FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-01-22 01:58:58 +00:00
Scott Main
ae6531d6b5 am 69edcce7: am d9d41f2d: am fbdcf317: fix code typo 
* commit '69edcce7831cb41cd0d1a40159fa7a12a3123687':
  fix code typo
 2014-01-22 01:55:31 +00:00
Christopher Tate
46c95dfc10 am b450505c: am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted" 
* commit 'b450505c2e0d0dfd67bc228961a00a6eaaf092df':
  FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-01-22 01:55:07 +00:00
Scott Main
69edcce783 am d9d41f2d: am fbdcf317: fix code typo 
* commit 'd9d41f2db29a4bd9bcf3b064067f41742a9265e9':
  fix code typo
 2014-01-21 17:52:05 -08:00
Christopher Tate
b450505c2e am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted" 
* commit 'a7a9327be8b2b2ee2a461d1a0558c0c7b5b9271c':
  FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-01-22 01:51:34 +00:00
Scott Main
d9d41f2db2 am fbdcf317: fix code typo 
* commit 'fbdcf317fa751dc7d629b5c38688369ea2acf0ad':
  fix code typo
 2014-01-22 01:49:36 +00:00
Christopher Tate
a7a9327be8 am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted" 
* commit '5474f085b05b527f7e1dc7c6f536736c2f043fb0':
  FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-01-21 17:48:35 -08:00
Christopher Tate
5474f085b0 am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted" 
* commit '9fc157a4767f54d1cff53dc9489638b67aec2da3':
  FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-01-21 17:45:00 -08:00
Christopher Tate
9fc157a476 Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted" 2014-01-22 01:42:50 +00:00
Andy Hung
bdf8db0828 Merge "Add "throws IOException" to MediaCodec factory methods" 2014-01-21 23:03:33 +00:00
Adam Powell
c9c93e75ba Merge "Revert "Update smoothScrollToPosition to move faster for large offsets"" 2014-01-21 18:41:24 +00:00
Adam Powell
56032a37df Revert "Update smoothScrollToPosition to move faster for large offsets" 
This reverts commit 203af24e4c2975c0b95fb4cc85ea03865e3b0e5b.

Change-Id: Ic56a9ded03eec188fb2834b42b60171f3cacb58b
 2014-01-21 18:39:53 +00:00
Scott Main
fbdcf317fa fix code typo 
Change-Id: I66c86cb778a7e2237e71a7a70dee420d82a5e557
 2014-01-21 10:12:07 -08:00
Naofumi Harada
719b3b8075 FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
Since Kitkat, an app pre-loaded under /system/priv-app/ has
FLAG_PRIVILEGED. However, if the app updated and the device
rebooted, privileged flag is unset from pkgFlags. This patch
fix issue to assign privileged flag when scanning the updated
packages.

Bug: 12640283

Change-Id: Ic24b5882f65dabdfae9cc39da3d68661bed4fc31
 2014-01-21 07:41:11 +00:00
Narayan Kamath
548fc32efc Java7 Locale & Script related changes. 
The foundation for supporting ISO-639-3 languages.

Change-Id: I1327ee4f2c334acfd67dbc532680e1d721e09ac1
 2014-01-20 10:33:58 +00:00
Narayan Kamath
2ba4efff8b Hide AssetInputStream.getAssetInt (Take 2) 
This reverts commit b1bd1fe7fd9ed6b6e4518713ef5f5716a84d97e8.
 2014-01-20 10:18:44 +00:00
Johan Redestig
0464c07a9e Only send storage intents after boot complete 
It is not possible to send a broadcast before the system
boot is completed. If you do it anyway you will get an
IllegalStateException: Cannot broadcast before boot completed.

If a memory card is inserted or removed while the phone is
booting up, there is a risk that the MountService will try to
broadcast a storage intent too early, and cause the device
to crash.

Use FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT to avoid
problems with too early broadcasts.

Change-Id: Ied36a13d235df37c9788e45a35de40d919ae0cd0
 2014-01-18 22:46:56 +01:00
Elliott Hughes
39312ff423 am a850e5ac: am 8815d261: am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit 'a850e5ac27662ff2030d6a3d3f1ce1f6cb7c2e44':
  Don't confuse stat and stat64.
 2014-01-18 02:47:20 +00:00
Igor Murashkin
b121ea542a Merge "camera2: Add android.request.partialResultCount" 2014-01-18 02:45:55 +00:00
Elliott Hughes
a850e5ac27 am 8815d261: am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit '8815d261d9fefbac8f24936dc37a055ab9ced038':
  Don't confuse stat and stat64.
 2014-01-18 02:44:06 +00:00
Elliott Hughes
8815d261d9 am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit '8da106ebf31d725c00c1910a51f6e1cfb0d8c052':
  Don't confuse stat and stat64.
 2014-01-18 02:42:01 +00:00
Elliott Hughes
8da106ebf3 am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit 'aa80f1a3caf6271f1c48a779e260811f2802a9f0':
  Don't confuse stat and stat64.
 2014-01-17 18:38:17 -08:00
Igor Murashkin
2086b58880 camera2: Add android.request.partialResultCount 
Change-Id: Ie21010767ad1e58b3a46e977e7f9ee7f1951bad2
 2014-01-17 18:36:07 -08:00
Elliott Hughes
aa80f1a3ca am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit 'c9a60b0f77525244ac4f970258703b8dc62ee140':
  Don't confuse stat and stat64.
 2014-01-17 18:36:02 -08:00
Elliott Hughes
c9a60b0f77 Merge "Don't confuse stat and stat64." 2014-01-18 02:32:40 +00:00
Ruben Brunk
d928b8c9a0 Merge "camera3: Update optical stabilization tags." 2014-01-18 02:31:19 +00:00
Ruben Brunk
00849b3a43 camera3: Update optical stabilization tags. 
Change-Id: Ic2bdec216c1685f2ea3036f9d027ea24679a8bfe
 2014-01-17 18:30:23 -08:00
Igor Murashkin
ae7d2f19e4 Merge "camera2: Add synchronization definitions to enable LIMITED HAL3 devices" 2014-01-18 02:28:16 +00:00
Igor Murashkin
3865a84255 camera2: Add synchronization definitions to enable LIMITED HAL3 devices 
Change-Id: Ic5fda4bdc3dda0d21f4738c81b5742f86e4ef02c
 2014-01-17 18:27:35 -08:00
Elliott Hughes
ad076286c3 Don't confuse stat and stat64. 
Bug: 11865851
Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f
 2014-01-17 18:27:27 -08:00
Igor Murashkin
1e2d27a97f Merge "camera2: Add test patterns and pipeline depth information" 2014-01-18 02:15:25 +00:00
Igor Murashkin
c127f05292 camera2: Add test patterns and pipeline depth information 
Bug: 9625427
Change-Id: I11ff3a74f3a115ac9b699ce516400ed323c274f9
 2014-01-17 18:13:52 -08:00
Jeff Brown
509cc13b70 am e2c9cd58: Merge "Refactor display manager service to new pattern." into klp-modular-dev 
* commit 'e2c9cd583f4f706b48270b8cbe84df627c69af24':
  Refactor display manager service to new pattern.
 2014-01-18 01:53:32 +00:00
Jeff Brown
e2c9cd583f Merge "Refactor display manager service to new pattern." into klp-modular-dev 2014-01-18 01:44:08 +00:00
Ruben Brunk
ce29f43845 Merge "camera3: Update sceneMode tag spec." 2014-01-18 01:43:58 +00:00
Ruben Brunk
e667936693 camera3: Update sceneMode tag spec. 
Change-Id: I495435397086a295280c556d94fe8efd442a12c3
 2014-01-17 17:34:32 -08:00
Igor Murashkin
e0060930cb camera_metadata: Update android.tonemap.* definitions 
Change-Id: Icdabd02d892018b104955146a4d94b5042ea59d8
 2014-01-17 17:24:11 -08:00
Zhijun He
b8fb80dd0c Merge "Camera2: Update shading mode spec" 2014-01-18 00:46:08 +00:00
Ruben Brunk
c759efb9f3 Merge "camera3: Update availableEffects, effectMode tags in frameworks/base." 2014-01-18 00:44:46 +00:00
Zhijun He
ba93fe6468 Camera2: Update shading mode spec 
Change-Id: Id4dc8de6e66aa130677ecab700a982943fcd8e09
 2014-01-17 16:43:05 -08:00