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

1447 Commits

Author SHA1 Message Date
Deepanshu Gupta
9eb695f0a3 am 9c403d85: am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '9c403d8513db5790364e9f5fafca5c6cf896d369':
  Ensure that RandomAccessFile is not leaked.
 2014-12-04 21:56:16 +00:00
Deepanshu Gupta
1f4bafef12 am 940a1e56: am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '940a1e563fd94f912a7322cea8f0a5662b79050f':
  Fix AnalogClock rendering
 2014-12-04 21:56:12 +00:00
Deepanshu Gupta
6c8175fcc4 am 028df22f: am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev 
* commit '028df22fd774c8a545dedb03124587b7a19e047b':
  Fix typos in previous bugfixes.
 2014-12-04 21:56:07 +00:00
Deepanshu Gupta
9c403d8513 am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '43d0e67573e8122d9e75accb00eaa453e2755713':
  Ensure that RandomAccessFile is not leaked.
 2014-12-04 21:46:26 +00:00
Deepanshu Gupta
940a1e563f am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '52a60ff6366a4f5cf1ed9697b7cebd6f9300de2b':
  Fix AnalogClock rendering
 2014-12-04 21:46:20 +00:00
Deepanshu Gupta
028df22fd7 am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev 
* commit 'c16d1448bb139384cc86d14d9412ffe1a62817c8':
  Fix typos in previous bugfixes.
 2014-12-04 21:46:14 +00:00
Deepanshu Gupta
7e168ad04a am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '6cbef4bd3e1f16647ab01dc29df9a357d54a85de':
  Ensure that RandomAccessFile is not leaked.
 2014-12-04 07:00:19 +00:00
Deepanshu Gupta
302a7cc13a am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '4628d51a0d01641ca7fe2cf8403ad551ea6f50ce':
  Fix AnalogClock rendering
 2014-12-04 07:00:14 +00:00
Deepanshu Gupta
f708d27fa0 resolved conflicts for merge of fb30a783 to lmp-mr1-dev 
Change-Id: I91fdb76c748b97376d6469c8d1198a15c4395463
 2014-12-04 10:30:40 +05:30
Deepanshu Gupta
6cbef4bd3e am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '03af0c42d80734c44198b96a99488bb94816ae97':
  Ensure that RandomAccessFile is not leaked.
 2014-12-03 20:58:27 +00:00
Deepanshu Gupta
4628d51a0d am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '141c7614fdef45d1a95ccb325da762a79412aae2':
  Fix AnalogClock rendering
 2014-12-03 20:58:23 +00:00
Deepanshu Gupta
fb30a783d3 am 7e55c292: Merge "Fix typos in previous bugfixes." into lmp-dev 
* commit '7e55c29281f8a62154451e87b45d95ec5f97c5ac':
  Fix typos in previous bugfixes.
 2014-12-03 20:58:19 +00:00
Deepanshu Gupta
5ceb7f6431 Ensure that RandomAccessFile is not leaked. 
This change ensures that RandomAccessFile is always closed. Also, it
changes the BufferIterator implementation to delegate to the byte buffer
directly instead of mainitaining the position itself.

Change-Id: I8f93e80c91a7c35e6a7fb015185b8b11e36b6286
 2014-12-02 14:24:36 +05:30
Deepanshu Gupta
17a6170c62 Fix AnalogClock rendering 
1. Change calls to java.lang.System.log* since they don't exist on the
host.
2. Clean up method rewrite mechanism in ReplaceMethodCallsAdapter.
3. Stub out creation of uninitialized GregorianCalendar.
4. Memory map the time zone data base file and provide a custom
implementation of BufferIterator for use by ZoneInfoDB
5. Delete unused Time_Delegate

Also fixed a comment in BridgeAssetManager and an error message in
FontFamily_Delegate.

Bug: http://b.android.com/79160
Change-Id: Iae5ef65678f0e6c7c5af520c45bd15980ce3fa55
 2014-11-26 12:03:39 +00:00
Deepanshu Gupta
7cfcfba9d3 am fbff0191: am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df 
* commit 'fbff0191f60722894291529af28f14af7bb967e4':
  Fix setTextAppearance for styles with dots.
 2014-11-21 12:19:14 +00:00
Deepanshu Gupta
fbff0191f6 am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df 
* commit '58238d900b43f6b780890b7ea93c11a877936ed7':
  Fix setTextAppearance for styles with dots.
 2014-11-21 10:17:00 +00:00
Deepanshu Gupta
9ab79551ac am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev 
automerge: ddc83df

* commit 'ddc83dfa8f17db1a8a566c8b92b0fea56dedd00a':
  Fix setTextAppearance for styles with dots.
 2014-11-21 10:06:59 +00:00
Dianne Hackborn
f8c3691425 am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
automerge: 377d6f0

* commit '377d6f00dc2ab42df501fd12b23e1dab54cea6b7':
  Fix issue with call backs from media process.
 2014-11-21 01:52:23 +00:00
Dianne Hackborn
377d6f00dc am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
* commit '42fec57f3addfb1958f814b5d6772ff81341ba20':
  Fix issue with call backs from media process.
 2014-11-21 00:43:51 +00:00
Deepanshu Gupta
cb09bc45c5 Fix typos in previous bugfixes. 
The commits 2c9fbdd and 12b6d29 introduced minor bugs. This change fixes
them.
 2014-11-20 13:35:47 +00:00
Deepanshu Gupta
ddc83dfa8f am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev 
* commit '4104abf875e16ad54c248ce602e573d2144732dd':
  Fix setTextAppearance for styles with dots.
 2014-11-19 23:00:43 +00:00
Deepanshu Gupta
a0bc2e7e3c am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev 
* commit '455654cffdaebcbbd4fa33de5bb18fa2752d6c9a':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
 2014-11-19 23:00:39 +00:00
Deepanshu Gupta
4104abf875 Merge "Fix setTextAppearance for styles with dots." into lmp-dev 2014-11-19 22:30:20 +00:00
Dianne Hackborn
ff17024e58 Fix issue with call backs from media process. 
All but a few lines of this is for issue #16013164, which allowed
apps to do some operations as the media uid by having it call
back to them to open a file.  The problem here is with the tempory
identity stuff in the activity manager, allowing us to make the open
call as the original caller...  ideally we should figure out a way
to just get rid of all of that, but the solution here is actually
easier (even though it doesn't look it) -- we now hand a token over
to the openFile() call that it can use when doing permission checks
to say "yes I would like the check to be against whoever is responsible
for the open".  This allows us to do the uid remapping for only this
one specific set of permission checks, and nothing else.

Also fix issue #17487348: Isolated services can access system services
they shouldn't be able to.  Don't send any system service IBinder objects
down for the first initialization of an isolated process.

Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
 2014-11-19 14:29:10 -08:00
Deepanshu Gupta
2c9fbdd29c Fix setTextAppearance for styles with dots. 
Bug: http://b.android.com/78842
Change-Id: I65923134b2d3812030e2b7dd8ab96363b0647c1f
 2014-11-18 22:52:10 +00:00
Deepanshu Gupta
12b6d29b7b LayoutLib: Stub AM/PM keycodes in Time Picker. 
TimePickerSpinnerDelegate doesn't need to deal with input when running
inside LayoutLib. So, we just return the keycodes as if it's running in
English locale.

Bug: http://b.android.com/79189
Change-Id: Ife0ae91a1e34a8dac379bc1dda1c1c8ed461c164
 2014-11-18 22:02:40 +00:00
Jeff Brown
70170261cb am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev automerge: c1275e7 
automerge: a473878

* commit 'a4738781584d58e133fc4d0f55d9b7ebcb246ff6':
  Move device admin max screen off timeout to internal interface.
 2014-11-12 02:46:10 +00:00
Jeff Brown
a473878158 am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 
automerge: c1275e7

* commit 'c1275e72eceb171544aaf517f0cb6e3d1cbd9e08':
  Move device admin max screen off timeout to internal interface.
 2014-11-12 00:24:43 +00:00
Jeff Brown
32f7a6d813 Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 2014-11-11 22:27:45 +00:00
Deepanshu Gupta
83e5329b3b am 028372b0: am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev automerge: 8f6e7a8 
* commit '028372b070d3d293ac6b1b42681339bee7848407':
  Don't skip loading object animator.
 2014-11-11 18:39:39 +00:00
Deepanshu Gupta
028372b070 am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
automerge: 8f6e7a8

* commit '8f6e7a868ce7715184a0d9239c6a72d269083c38':
  Don't skip loading object animator.
 2014-11-11 18:16:28 +00:00
Deepanshu Gupta
7ed525bf92 am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit '5ad9b395db341b3360d481039f152f8ce1d8360c':
  Don't skip loading object animator.
 2014-11-11 17:22:00 +00:00
Deepanshu Gupta
5ad9b395db am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit 'a44fdb9e216810ba62f20c1b4571ebc240931efa':
  Don't skip loading object animator.
 2014-11-11 17:17:02 +00:00
Deepanshu Gupta
2c5cddbd07 Don't skip loading object animator. 
This is used by Buttons as part of StateListAnimator.

Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
 2014-11-11 15:21:19 +00:00
Diego Perez
4985297bd7 Merge "Add new parameter to the render method to allow forcing a measure pass." 2014-11-11 09:51:02 +00:00
Deepanshu Gupta
de4731eafa am fb5877a4: am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 automerge: 7d3d5fe automerge: 1f33b2f 
* commit 'fb5877a4e7ac63df741489484f1642af0d592397':
  Fix setting styles in custom views.
 2014-11-11 00:04:35 +00:00
Deepanshu Gupta
8d7a834dff am 7cc11f8b: am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac automerge: 828db35 automerge: 1adeba2 
* commit '7cc11f8bf3aedeb199331dca064c89ea58312a68':
  Add primitive shadows support to LayoutLib
 2014-11-10 23:59:50 +00:00
Deepanshu Gupta
0ca185adaf am 9713d740: am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8 automerge: aa53920 
* commit '9713d740182f37f15849997979384fde00a1f9c1':
  Remove needlessly thrown IOException.
 2014-11-10 23:59:45 +00:00
Deepanshu Gupta
fb5877a4e7 am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 automerge: 7d3d5fe 
automerge: 1f33b2f

* commit '1f33b2f6f61f66b751d6ecb2660bed8f36c91986':
  Fix setting styles in custom views.
 2014-11-10 23:57:27 +00:00
Deepanshu Gupta
7cc11f8bf3 am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac automerge: 828db35 
automerge: 1adeba2

* commit '1adeba2c7399e619760b413d810de9c6371b3159':
  Add primitive shadows support to LayoutLib
 2014-11-10 23:56:18 +00:00
Deepanshu Gupta
9713d74018 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8 
automerge: aa53920

* commit 'aa53920479b7e1916e0d2afbf6846250a2deeabf':
  Remove needlessly thrown IOException.
 2014-11-10 23:54:59 +00:00
Dan Sandler
f2d9b00832 am 34f24aef: am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit '34f24aef58b015709447cb09bad5f7ae0ca7989c':
  Fix inset hinting when adding window
 2014-11-10 22:13:03 +00:00
Deepanshu Gupta
7d3d5feb31 am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 
* commit '4c0f0e6c852dd933bcfaf95380cca49a46fa3912':
  Fix setting styles in custom views.
 2014-11-10 22:05:27 +00:00
Deepanshu Gupta
828db35568 am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac 
* commit '3cf0640d944a0718b9e29a2134a577e72a9432b4':
  Add primitive shadows support to LayoutLib
 2014-11-10 22:05:23 +00:00
Deepanshu Gupta
a09dda8162 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c 
* commit '0e3925dfb3ea4e9185202dd963f03f5ca1df17d0':
  Remove needlessly thrown IOException.
 2014-11-10 22:05:16 +00:00
Dan Sandler
34f24aef58 am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
  Fix inset hinting when adding window
 2014-11-10 22:04:09 +00:00
Deepanshu Gupta
4c0f0e6c85 Merge "Fix setting styles in custom views." into lmp-dev 
automerge: 5c22a79

* commit '5c22a79baf81727b56a85a194d678c18449b5150':
  Fix setting styles in custom views.
 2014-11-10 21:00:43 +00:00
Deepanshu Gupta
3cf0640d94 Merge "Add primitive shadows support to LayoutLib" into lmp-dev 
automerge: 97c04ac

* commit '97c04ac7ed4f34ca0cfb75646cc00687fb0954d4':
  Add primitive shadows support to LayoutLib
 2014-11-10 20:58:58 +00:00
Deepanshu Gupta
0e3925dfb3 Merge "Remove needlessly thrown IOException." into lmp-dev 
automerge: f305d2c

* commit 'f305d2c4a80af9e2011824349adc6f133cd8822c':
  Remove needlessly thrown IOException.
 2014-11-10 20:56:36 +00:00
Deepanshu Gupta
8657baa06d Fix setting styles in custom views. 
Bug: http://b.android.com/78842
Change-Id: I5d4571d94d96b00419acc258c9e2b519367b689d
 2014-11-10 20:10:55 +00:00