Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,508 Commits 3 Branches 0 Tags
bb615a6ffbc8a051007163916f1ed085d10b5327
Commit Graph

36509 Commits

Author SHA1 Message Date
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
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 c6a2a6e20f.

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
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 203af24e4c.

Change-Id: Ic56a9ded03eec188fb2834b42b60171f3cacb58b
 2014-01-21 18:39:53 +00:00
Narayan Kamath
2ba4efff8b Hide AssetInputStream.getAssetInt (Take 2) 
This reverts commit b1bd1fe7fd.
 2014-01-20 10:18:44 +00:00
Igor Murashkin
b121ea542a Merge "camera2: Add android.request.partialResultCount" 2014-01-18 02:45:55 +00: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
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
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
Ruben Brunk
5f1dcfe49d camera3: Update availableEffects, effectMode tags in frameworks/base. 
Change-Id: I1edc89f7af9ef15894cfd398116730afa6b0053c
 2014-01-17 16:42:51 -08:00
Ruben Brunk
aca1c6850d Merge "camera3: Update availableSceneModes tag spec in frameworks/base." 2014-01-17 23:35:21 +00:00
Ruben Brunk
8237d34398 camera3: Update availableSceneModes tag spec in frameworks/base. 
Change-Id: Ic12f131e438d1370c9db0027a4c54a540a5cb78f
 2014-01-17 15:33:02 -08:00
Ruben Brunk
a20f4c2648 camera3: focalLength tag frameworks/base changes. 
Change-Id: I59614223ae65e602f3461029cb4b8848fb22950e
 2014-01-17 15:21:13 -08:00
Igor Murashkin
7d2a5c5e73 camera2: Update spec for android.colorCorrection.* in metadata 
Change-Id: I02ba758f3da9e7c9e304591c410ca5385ebf4b4b
 2014-01-17 15:07:52 -08:00
Igor Murashkin
143aa0b891 camera3: Specify frame durations and minimum frame durations in metadata 
Change-Id: Ic52c54c3c26e3547a1064fc5afc8ebbac5b392ad
 2014-01-17 15:02:34 -08:00
Zhijun He
f3b16df380 Camera2: update metadata java doc 
Change-Id: Iafa14eeb7151cd7aada1fd09c1f02b5b36abfa54
 2014-01-17 13:37:59 -08:00
Ruben Brunk
855bae407d camera3: Update filterdensity tags. 
Change-Id: I4e73dcbcfb5a9230e8e2d187e47bc0f829ffc7f6
 2014-01-17 18:31:20 +00:00
Jeff Brown
4ccb823a9f Refactor display manager service to new pattern. 
Transform DisplayManagerService into a SystemService and start cleaning
up other local services that it uses from window manager and input manager.

Clean up service thread initialization.

Remove unnecessary static variables from ActivityManagerService.

It's starting to become clear that we really need a better way to manage
service dependencies.  Boot phases don't quite cut it.

Change-Id: If319dbd7cbfbd4812fe55ece969e818d4b20755b
 2014-01-16 22:16:42 -08:00
Zhijun He
a739445a63 Merge "Camera2: update captureIntent and flash mode tag spec" 2014-01-17 02:25:47 +00:00
Zhijun He
66d065a6d4 Camera2: update captureIntent and flash mode tag spec 
Change-Id: Icf32f8643f7dbe4da98bed2d5a22298af7b58d26
 2014-01-16 18:18:50 -08:00
Yohei Yukawa
c4d0696dd3 Merge "Make the range checking of BaseInputConnection#setSelection stricter" 2014-01-17 01:57:52 +00:00
Zhijun He
228f4f92e7 Camera2: Update 3A state doc 
Change-Id: Id484bdff38af34ad2c8b64863d036ff81124401e
 2014-01-16 17:22:05 -08:00
Yohei Yukawa
ef0904106d Make the range checking of BaseInputConnection#setSelection stricter 
With this change, setSelection will not cause java.lang.IndexOutOfBoundsException
even if a negative index is specified.

Bug: 8841916
Change-Id: Ib62a6ba235f80b7495fefb2e5cc2d5357d804310
 2014-01-17 09:59:25 +09:00
Eino-Ville Talvala
77c3c99833 Merge "Camera2: Sort metadata @see to make it stable over time" 2014-01-17 00:29:04 +00:00