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

47206 Commits

Author SHA1 Message Date
Narayan Kamath
a7fa2e592e AssetManager cookies are now int32_t, not void*. 
This makes cookies on both the java & native side
4 byte signed integral values.

Change-Id: I6843d6c5ba7ff42dc454f20240844a158ae8e818
 2014-01-27 11:11:48 +00:00
Wink Saville
5197d0740c am dafb2420: am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit 'dafb2420a34a5b39aca6ddf993e86778edd76b5d':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 16:58:24 +00:00
Wink Saville
dafb2420a3 am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit 'd4b688cf97736eb4c543149686ab851b9ea21161':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 16:55:49 +00:00
Wink Saville
d4b688cf97 am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit 'd165f365b394b7632d8a0cfbc14bbf4004858333':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 16:52:26 +00:00
Wink Saville
d165f365b3 am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit '5d2d911ad1f69392cf2a56237ce7ad3bb9e78ffa':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 08:49:09 -08:00
Wink Saville
d1eeb67478 Merge "Telephony: Modify code to check that PUK code length is always 8." 2014-01-25 21:51:34 +00:00
Dianne Hackborn
31d9989e75 Merge "Add app version codes to procstats." 2014-01-24 23:30:51 +00:00
Narayan Kamath
8435cf0d8b Merge "Hide android.os.Parcel.obtain(int)." 2014-01-24 14:59:06 +00:00
Narayan Kamath
01664b3709 am 5d094b94: am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '5d094b947b328d2631a0203c1527b0c7c20ce219':
  Remove unused field from AssetManager.
 2014-01-24 09:52:55 +00:00
Narayan Kamath
5d094b947b am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit 'aa43eb518ce3c50c1b9a64fc526c8d1360d3789e':
  Remove unused field from AssetManager.
 2014-01-24 09:48:36 +00:00
Narayan Kamath
aa43eb518c am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '7866f2fcfa753154a492bfb3fb21061f6fcce709':
  Remove unused field from AssetManager.
 2014-01-24 09:45:13 +00:00
Narayan Kamath
7866f2fcfa am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '8005b9af11ea366672d739769510240f931f3050':
  Remove unused field from AssetManager.
 2014-01-24 01:42:08 -08:00
Dianne Hackborn
8472e6189c Add app version codes to procstats. 
Now the per-package proc stats data is also per-app-version-code.

In addition to changing the data structure to have one more
SparseArray and passing a version code all over, this also required
improving how we reset the stats so that we can prune a multi-package
process record back to a single package.  Otherwise, as you install
updates to apps, the proc stats data would continue to explode as
the data for each of those app's processes got turned to a
multi-package due to tracking the old and new versions at the
same time.

This also bumps the checkin version code, since the package entries
also include a new field for the app version code.

Change-Id: I80de36addb0a75c7b08aef747c6f6c8012d01ee4
 2014-01-23 18:00:11 -08:00
Selim Gurun
2474ebe879 am 0a33c4f9: am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit '0a33c4f9f54b59dac4e745e09db05990d53a1aba':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 22:46:56 +00:00
Selim Gurun
0a33c4f9f5 am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit '6735020adbcc7028185ca536e2b2cb49ec7687fb':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 22:42:00 +00:00
Selim Gurun
6735020adb am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit 'd261243c146515184cb4caf2284c6764a045443a':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 14:39:53 -08:00
Selim Gurun
355ed4ac43 Revert "Adding freeMemoryForTests static method to WebView." 
This reverts commit c6a2a6e20f7ddd5a903e9395f6c574c316960694.

Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
 2014-01-23 22:13:40 +00:00
Selim Gurun
647c5160a2 am b311739d: am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit 'b311739d6fd2fdc5a3607ad79a1547af8500cfae':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 19:59:19 +00:00
Selim Gurun
b311739d6f am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit 'd9c2e3d30f7af615ae78848f6a7f52ed5c539d33':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 19:54:15 +00:00
Selim Gurun
d9c2e3d30f am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit '016075239fc28704bb0e2b78a3c5540fde711eea':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 11:51:22 -08:00
Selim Gurun
c6a2a6e20f Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
Bug: b/10629847

(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: Ie16a94baa15f868d60f3837290dcc8045aea31a9
 2014-01-23 11:21:00 -08:00
Baligh Uddin
ff86e532dc Import translations. DO NOT MERGE 
Change-Id: I5d41b182178898b84085e67b192b8d2f1c27fcc9
Auto-generated-cl: translation import
 2014-01-23 07:56:14 -08:00
Narayan Kamath
b34a4615f8 Hide android.os.Parcel.obtain(int). 
This will break on 64 bit because 64 bit pointers are
wider than java int.

Also, this method technically isn't a public API because
it's a protected method on a final class. It shows up in
our api.txt files because of a quirk in the API generation
system.

Change-Id: I2b574943008ed34696b048195c0cac6af1aa0a3b
 2014-01-23 14:26:29 +00:00
Dianne Hackborn
39e79006cf Merge "Battery stats improvements." 2014-01-22 22:18:13 +00:00
Dianne Hackborn
099bc627c4 Battery stats improvements. 
- Adjust total power use when there is unaccounted power so that our
  percentages don't end up > 100%.
- Fix accounting of isolated uids to be against the owning real app
  uids.
- Rework how we put cpu use into the battery stats to no longer need
  this uid name cache that can confuse the uid it is associated with.
- Finish implementing events in the history, adding a string pool and
  reading/writing/dumping them.
- Add first two events: processes starting and finishing.
- Fix alarm manager reporting of wakeup alarms to be adjusted by the
  WorkSource associated with the alarm, so they are blamed on the
  correct app.
- New "--history" dump option allows you to perform a checkin of
  only the history data.
- Fixed BitDescription bug that would cause incorrect printing of
  changes in some states.

Change-Id: Ifbdd0740132ed178033851c58f165adc0d50f716
 2014-01-22 14:09:02 -08:00
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
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
Narayan Kamath
2ba4efff8b Hide AssetInputStream.getAssetInt (Take 2) 
This reverts commit b1bd1fe7fd9ed6b6e4518713ef5f5716a84d97e8.
 2014-01-20 10:18:44 +00: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
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