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

109692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chong Zhang
d7c05c2ca9 Merge "Select BT route when currently selected route becomes unavailable" 2013-07-26 23:46:46 +00:00
Jonathan Dixon
697c8ed523 Remove spurious @Deprecate tag from WebView.onMeasure 
onMeasure is not deprecated, this tag is spurious (and has no effect on
the api.txt or SDK anyway)

Change-Id: Iae003727649e86db2e0adaa5071399b676526c38
 2013-07-26 16:40:02 -07:00
Colin Cross
ddb1428ab6 Merge "set the extra_free_kbytes kernel vm tunable" 2013-07-26 23:09:09 +00:00
Colin Cross
59d80a5270 set the extra_free_kbytes kernel vm tunable 
Set the sys.sysctl.extra_free_kbytes property, which will proxy
through init to the /proc/sys/vm/extra_free_kbytes tunable (on
kernels where it exists).  This will ask the kernel to keep
more memory free, causing lowmemorykiller to fire earlier and
allocations to succeed faster.

The size is set to 3 full screen 32bpp buffers.  Products can
override the size with an absolute or adjustment value using
overlays config_extraFreeKbytesAbsolute and
config_extraFreeKbytesAdjust.

Bug: 10024467
Change-Id: Ib4d4507513ec3c1f4d4ceeb81ed632d1ad643437
 2013-07-26 16:06:45 -07:00
Mathias Agopian
d06db894b2 Merge "get rid of HAL pixelformats 5551 and 4444" 2013-07-26 23:04:50 +00:00
Alan Viverette
7e897aa600 Merge "Show FastScroller thumb on mouse-over" 2013-07-26 22:56:39 +00:00
Chong Zhang
2e5fbf5521 Select BT route when currently selected route becomes unavailable 
Bug: 10003524
Change-Id: I5de740fac9f2bc2a56125296defe892a8deb505e
 2013-07-26 15:36:37 -07:00
Dianne Hackborn
db983e9a9c Merge "Proc stats: include information about config." 2013-07-26 22:25:37 +00:00
Dianne Hackborn
244f5d24e1 Proc stats: include information about config. 
We now include in the app ops information about the device runtime
config that is relevant.  Currently this is the dalvik runtime in
use and the webview.  In checkin, this data looks like:

config,libdvm.so,webview

Change-Id: I85fd53418bd43595468f23ec8619e772fdaee7e1
 2013-07-26 15:23:11 -07:00
Christopher Tate
47cb93dd6e Merge "Maintain ordering when alarm removal alters batch bounds" 2013-07-26 22:12:32 +00:00
Christopher Tate
4cb338de35 Maintain ordering when alarm removal alters batch bounds 
Also: turn off verbose logging, but enable a new debugging
consistency check.

Bug 9965704

Change-Id: Ib20fb8b6275b77ff98291cf12a43b2a1128ab4b9
 2013-07-26 15:03:53 -07:00
Mathias Agopian
b251f3d0c6 get rid of HAL pixelformats 5551 and 4444 
Change-Id: I6a6c4c656d80280eb85f90f99f35721ffca285df
 2013-07-26 14:58:00 -07:00
Marco Nelissen
3f44fae1dd am 77802977: am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever" 
* commit '778029776bac60856af7e97e19deb7b1f42b1984':
  Fix NullpointerException in MediaMetadataRetriever
 2013-07-26 14:55:00 -07:00
Marco Nelissen
778029776b am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever" 
* commit '161b3624c2243cc5267287ebb5107cecffc918d1':
  Fix NullpointerException in MediaMetadataRetriever
 2013-07-26 14:52:41 -07:00
Marco Nelissen
161b3624c2 Merge "Fix NullpointerException in MediaMetadataRetriever" 2013-07-26 21:13:59 +00:00
Jim Miller
c82bcca551 Merge "Keyguard doesn't need new MANAGE_DEVICE_ADMINS permission" 2013-07-26 21:06:18 +00:00
Mathias Agopian
9f213c8b64 Merge changes I487d4eef,Ia750811f 
* changes:
  get rid of PixelFormatInfo and simplify things
  get rid of PIXEL_FORMAT_A_8
 2013-07-26 20:56:23 +00:00
David Christie
54e5f0eb76 Merge "Revert "Add WorkSource capability to AlarmManager"" 2013-07-26 19:45:28 +00:00
Alex Ray
da85ef3082 Merge "libandroid_runtime: android_print needs NELEM def" 2013-07-26 19:42:31 +00:00
David Christie
f10f9ea06c Revert "Add WorkSource capability to AlarmManager" 
This reverts commit 02600fb66b805c161e35f6c787372e4074f2213f.

Broke some tests.

Change-Id: Ic47b23a935bf90aba817073c27cd247306db7d5f
 2013-07-26 19:40:53 +00:00
Mattias Petersson
1d766b5321 Add support for MNC=00 
This adds support for operators with MNC (Mobile Network Code) zero
to add customized resources. For example, it makes it possible to
add a folder called "/res/values-mnc00/" in an application. This will
cause resources in that folder to be used when MNC is zero.
(There is a total of 14 countries that have an operator with MNC
zero.)

Without this fix, the resource framework gets confused, because MNC 0
is normally used when the MNC is undefined (not set).

Bug: 7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
 2013-07-26 18:42:34 +00:00
John Spurlock
136247b037 Merge "StatusBarNotification cleanup." 2013-07-26 18:42:12 +00:00
David Christie
52235b844f Merge "Add WorkSource capability to AlarmManager" 2013-07-26 18:38:40 +00:00
Craig Mautner
2982199271 Merge "Update configuration before setting override size." 2013-07-26 18:37:58 +00:00
Zhihai Xu
876d100f02 Merge "Add debug menu to enable btsnoop" 2013-07-26 18:33:43 +00:00
Daniel Karlberg
8014cbffad Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter. 
This fix ensures that onFinished() is always called in a syncClient
even if the application lacks the READ_SYNC_SETTINGS permission.

Change-Id: I944717e71ceae06a665f8a3b1199b41d73e12da4
 2013-07-26 18:19:48 +00:00
Oscar Rydhé
425916e4c5 Fix NullpointerException in MediaMetadataRetriever 
According to the API documentation and the ICS implementation
the setDataSource(String) method throws an
IllegalArgumentException if path is null. In JB a
NullpointerException is thrown instead. This fix restores
the earlier behaviour.

Change-Id: Ic47baadf91076acc227d92d84f6b8d1d6ecd0c03
 2013-07-26 18:18:17 +00:00
Zhihai Xu
c8a4d7d089 Merge "Revert "Bluetooth stopped working in master - "bad file descriptor""" 2013-07-26 18:15:13 +00:00
Zhihai Xu
560a523159 Revert "Bluetooth stopped working in master - "bad file descriptor"" 
This reverts commit df3cedab6fce59ce1dde4316bf63df7f7e488e23.

Change-Id: I9ffaf5580924c150145d37ec38ffde602199b7e2
 2013-07-26 18:10:06 +00:00
Zhihai Xu
d4360f0c17 Merge "Bluetooth stopped working in master - "bad file descriptor"" 2013-07-26 18:08:32 +00:00
Geremy Condra
350d274746 Merge "Remove unused mDnsOverridden" 2013-07-26 17:48:54 +00:00
Martijn Coenen
437d770118 Merge "Change XML-grammar for (Off)HostApduServices." 2013-07-26 16:52:55 +00:00
David Christie
02600fb66b Add WorkSource capability to AlarmManager 
Change-Id: Ibcff01a9f54a89fde6e7e5b7658e9a90b9a2445b
 2013-07-26 09:41:59 -07:00
David Christie
701ace2e68 Merge "Add WorkSource capability to WifiManager for starting a scan." 2013-07-26 16:35:02 +00:00
Andrew Flynn
a92ce1f32d Keyguard doesn't need new MANAGE_DEVICE_ADMINS permission 
Accidentally added in a418cf2

Bug: 9856348
Change-Id: I662fbcc8471b529651701084a703f89dfc642279
 2013-07-26 08:26:10 -07:00
John Spurlock
a381d375f3 StatusBarNotification cleanup. 
Remove obsolete ctor and obsolete accessor comment.

Change-Id: Ib72abc8fbd2a5f9a1b82da986094667f39e0bf62
 2013-07-26 10:42:56 -04:00
Mathias Agopian
2ca204e4c0 get rid of PixelFormatInfo and simplify things 
Change-Id: I487d4eef7db0095ace4babf5bb100a8769711257
 2013-07-25 19:25:10 -07:00
Colin Cross
6108dda2db Merge "add overlays to override lowmemorykiller adjustment values" 2013-07-26 01:32:24 +00:00
Joe Fernandez
dda57de6ff am dfad4fbd: am 3febd463: Merge "docs: NDK r9 Release Notes (w/download size fix)" into jb-mr2-ub-dev 
* commit 'dfad4fbdde86cc5988b4f2e115d9fc20c87f468c':
  docs: NDK r9 Release Notes (w/download size fix)
 2013-07-25 17:50:01 -07:00
Joe Fernandez
dfad4fbdde am 3febd463: Merge "docs: NDK r9 Release Notes (w/download size fix)" into jb-mr2-ub-dev 
* commit '3febd463369b8595705170faf5fda52e27c8563b':
  docs: NDK r9 Release Notes (w/download size fix)
 2013-07-25 17:47:32 -07:00
Joe Fernandez
3febd46336 Merge "docs: NDK r9 Release Notes (w/download size fix)" into jb-mr2-ub-dev 2013-07-26 00:44:56 +00:00
Martijn Coenen
c3178e5f1c Change XML-grammar for (Off)HostApduServices. 
AIDs can now carry a category attribute. Clarified that
"OffHostApduService" is not bound to by Android, and may
be extended by offering service interfaces that are not
defined in the platform.

Change-Id: Idd0a3990beb927e8d81366013f53386fb46e3f9f
 2013-07-25 17:43:47 -07:00
Chet Haase
b63425e4e7 Merge "Fix lazy measure logic to not use obsolete values" 2013-07-26 00:27:50 +00:00
Mathias Agopian
6f7b589171 get rid of PIXEL_FORMAT_A_8 
Change-Id: Ia750811f08ddebdd5818da211fd03d61b75f8e97
 2013-07-25 17:25:02 -07:00
Matthew Williams
09d20f3bc2 Merge "Fixed NPE in SyncRequest for Bundle.EMPTY" 2013-07-26 00:23:11 +00:00
Dianne Hackborn
5bd42924f2 Merge "Okay, I give in, add null key support to ArrayMap and ArraySet." 2013-07-26 00:16:38 +00:00
Chet Haase
1f99240c64 am d766d71a: am d547bcec: Merge "Return the actual interpolator of the ViewPropertyAnimator" 
* commit 'd766d71a4ccb2d2a6966b2319f272f64fdcbfa7d':
  Return the actual interpolator of the ViewPropertyAnimator
 2013-07-25 17:04:16 -07:00
Dianne Hackborn
62d708f4dd Okay, I give in, add null key support to ArrayMap and ArraySet. 
Change-Id: Iac5035f9c5884a9f9d5acb38132bb128d7a55249
 2013-07-25 16:53:09 -07:00
Matthew Williams
68e39c3411 Fixed NPE in SyncRequest for Bundle.EMPTY 
Writing to bundle caller provides causes app to crash if bundle
is Bundle.EMPTY, which is backed by an unmodifiable map.

Change-Id: Ia9bdf12cddea9673bb84e0458cce8bc8027fbba5
 2013-07-25 16:40:23 -07:00
Chet Haase
deababcd53 Fix lazy measure logic to not use obsolete values 
Issue #10022821 Lazy measure broken

Change-Id: I618ed5e80291304b5430c853d51e70e09f057e4c
 2013-07-25 16:06:48 -07:00