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

131679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
71dd3d9121 am 2ca3962b: Merge "Initial implementation of NetworkScoreManager\'s backing service." 
* commit '2ca3962bc0168d360cf9567a313608347da51944':
  Initial implementation of NetworkScoreManager's backing service.
 2014-04-22 13:24:14 +00:00
Jeff Davidson
2ca3962bc0 Merge "Initial implementation of NetworkScoreManager's backing service." 2014-04-22 00:02:47 +00:00
Jeff Davidson
6a4b220f12 Initial implementation of NetworkScoreManager's backing service. 
This service will ultimately be responsible for propagating scores
down to lower-level network subsystems. For now, it just keeps scores
in memory and exposes these for debugging purposes via "adb shell
dumpsys network_score".

This change also adds provisioning of a default scorer. When
NetworkScoreService is first initialized, it checks to see if it has
ever set a default scorer; if not, it reads a package name from a
build config property and attempts to set it as the default.

Also add autogenerated equals/hashCode methods to all parcelables.

Bug: 14111427
Bug: 13786258
Change-Id: I02271171653d42e12acd240b73b9e23950744f6b
 2014-04-21 16:04:05 -07:00
Robert Greenwalt
fc4ecf3e96 am 3a025393: Merge "Make sure events handled on same looper" 
* commit '3a025393b50658b988411fbbb7435f8f87a4e16e':
  Make sure events handled on same looper
 2014-04-21 22:26:00 +00:00
Robert Greenwalt
3a025393b5 Merge "Make sure events handled on same looper" 2014-04-21 22:21:24 +00:00
Robert Greenwalt
2c9f5475be Make sure events handled on same looper 
Two handlers are used to call a function, but the init was not forcing them on the
same looper/thread, so we could get synchronization problems as a result.

Moved to a single looper.

Also added finally clauses to clean up if a broadcast throws an uncaught exception.

bug:13399768
Change-Id: I0044e2442335ee45a15588f910064e848cf6ac55
 2014-04-21 15:12:06 -07:00
Winson Chung
26ccc944dd am cdc3a47d: Merge "Overriding application icon with activity icon where available." 
* commit 'cdc3a47d4f0394893fd8670761ee0078ce7fcce1':
  Overriding application icon with activity icon where available.
 2014-04-21 22:10:26 +00:00
Winson Chung
cdc3a47d4f Merge "Overriding application icon with activity icon where available." 2014-04-21 22:05:20 +00:00
Jeff Tinker
1d947a9b41 am 2152a2c5: am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev 
* commit '2152a2c5f93872eac268306dc675558b2489d270':
  Allow DRM plugins to be destroyed when released
 2014-04-21 21:08:53 +00:00
Jeff Tinker
2152a2c5f9 am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev 
* commit 'e618f184733e745df4cf86019d23e085559e0f2c':
  Allow DRM plugins to be destroyed when released
 2014-04-21 21:06:13 +00:00
Jeff Tinker
e618f18473 am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev 
* commit '72eec7f6c9509fb86f46fbdb619523efacb8d02e':
  Allow DRM plugins to be destroyed when released
 2014-04-21 21:02:28 +00:00
Jeff Tinker
72eec7f6c9 Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev 2014-04-21 20:58:49 +00:00
Dianne Hackborn
129e1dc6d0 am ec687133: Merge "Try to always print time stamp in battery history." 
* commit 'ec687133e01d6650d630511ce96f184c6d829482':
  Try to always print time stamp in battery history.
 2014-04-21 20:56:53 +00:00
Dianne Hackborn
ec687133e0 Merge "Try to always print time stamp in battery history." 2014-04-21 20:52:49 +00:00
Adam Lesinski
892bf987f3 am 49d8fa47: am a281be67: am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 
* commit '49d8fa473970265a182549cc1673719e5101320e':
  Allow InputEvents to propagate w/o IME
 2014-04-21 20:29:19 +00:00
Adam Lesinski
49d8fa4739 am a281be67: am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 
* commit 'a281be67030a834d455a84ce62c173140564211a':
  Allow InputEvents to propagate w/o IME
 2014-04-21 20:25:03 +00:00
Adam Lesinski
a281be6703 am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 
* commit '370cda7074a02139fa5374bbdd94c37be376ca7a':
  Allow InputEvents to propagate w/o IME
 2014-04-21 20:21:13 +00:00
Adam Lesinski
370cda7074 Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 2014-04-21 20:18:11 +00:00
Dianne Hackborn
99009ea7dc Try to always print time stamp in battery history. 
Also fix printing of string pool to quote the strings
and escape characters, and change history time stamps
to print starting at 0 and going up.

Change-Id: I2d0c080f2b5de7b27b20a7357c2c0cf481c82d8c
 2014-04-21 13:10:38 -07:00
Jesse Hall
f9f4975fea am 4660c9e0: am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 
* commit '4660c9e064ebaec9ebb260c2853a8dab868ccdc2':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
 2014-04-21 19:53:10 +00:00
Colin Cross
0030efa975 am 95c95082: Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG" 
* commit '95c950825f02e937711fbcbff63f614a91cb1443':
  BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG
 2014-04-21 19:53:06 +00:00
Jesse Hall
4660c9e064 am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 
* commit '43cea7eadbcb3930887eadfa3f278e1a666449d0':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
 2014-04-21 19:49:40 +00:00
Colin Cross
95c950825f Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG" 2014-04-21 19:47:32 +00:00
Jesse Hall
43cea7eadb am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 
* commit '650a8860d9732accd938a32f99179cc86f101ef4':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
 2014-04-21 19:46:01 +00:00
Jesse Hall
650a8860d9 am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 
* commit 'fc3c6a0ef36cc4969aa7d8e160cc55f30c653325':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
 2014-04-21 19:41:29 +00:00
Winson Chung
11e41baac6 Overriding application icon with activity icon where available. 
Change-Id: I03ee8f806b3853183db7f96e71f1684c72b79c57
 2014-04-21 12:40:52 -07:00
Jesse Hall
fc3c6a0ef3 Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 2014-04-21 19:38:45 +00:00
Winson Chung
1978da4200 am deb1f268: Merge "Initial changes to add search bar." 
* commit 'deb1f268b7fc71ed23bac76af7dac6b5b04e8340':
  Initial changes to add search bar.
 2014-04-21 19:31:11 +00:00
Winson Chung
deb1f268b7 Merge "Initial changes to add search bar." 2014-04-21 19:26:09 +00:00
Ariel Gertzenstein
1544c71482 am ad7b890f: am 67881101: (-s ours) am fe755054: Merge "DO NOT MERGE Tear down PAN if we can\'t successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev 
* commit 'ad7b890f59d0493fb1d011c22721d68e2d22bf38':
  DO NOT MERGE    Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
 2014-04-21 18:55:48 +00:00
Ariel Gertzenstein
ad7b890f59 am 67881101: (-s ours) am fe755054: Merge "DO NOT MERGE Tear down PAN if we can\'t successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev 
* commit '6788110191fc457169d8268a4c25e1845d05ee07':
  DO NOT MERGE    Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
 2014-04-21 18:50:25 +00:00
Ariel Gertzenstein
6788110191 am fe755054: Merge "DO NOT MERGE Tear down PAN if we can\'t successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev 
* commit 'fe7550548d036b6c536840fd1daa954160d0b2c8':
  DO NOT MERGE    Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
 2014-04-21 18:47:40 +00:00
Ariel Gertzenstein
fe7550548d Merge "DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev 2014-04-21 18:41:53 +00:00
Ariel Gertzenstein
a2d8706ca8 DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request 
after establishing a PANU connection.

http://b/13731957

Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
 2014-04-21 14:26:56 -04:00
Dan Sandler
1c3dbc66e4 am 2146b914: Merge "Avoid NPE when mRoot is null." 
* commit '2146b91404bfe8274bb8b37bfea1d9b8059cdd12':
  Avoid NPE when mRoot is null.
 2014-04-21 17:47:23 +00:00
Dan Sandler
2146b91404 Merge "Avoid NPE when mRoot is null." 2014-04-21 17:39:31 +00:00
Dan Sandler
9ee256d252 Avoid NPE when mRoot is null. 
Bug: 14162288
Change-Id: I36793d706ab1d29576f536562a0c06f7805a0d50
 2014-04-21 17:34:49 +00:00
Mike Lockwood
2ad341b527 am 3fafb4eb: am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail 
* commit '3fafb4ebf2572578c6d7df742593ee5ed17748a8':
  MTP: Fix getThumbnail
 2014-04-21 16:53:10 +00:00
Mike Lockwood
3fafb4ebf2 am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail 
* commit 'f82c83a8debb468027921e4b479bf80fe7f04ee1':
  MTP: Fix getThumbnail
 2014-04-21 16:47:41 +00:00
Mike Lockwood
f82c83a8de am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail 
* commit 'eaabdce0ad556a91ccf731d042edfd9c5f249f5e':
  MTP: Fix getThumbnail
 2014-04-21 16:44:49 +00:00
Mike Lockwood
eaabdce0ad am ca1f8f6d: am c4367721: MTP: Fix getThumbnail 
* commit 'ca1f8f6d14a144dde64112cd471df5e9539ad521':
  MTP: Fix getThumbnail
 2014-04-21 16:40:18 +00:00
Mike Lockwood
ca1f8f6d14 am c4367721: MTP: Fix getThumbnail 
* commit 'c436772120ceea1d6e3f5b388ef068c99c8bb7d6':
  MTP: Fix getThumbnail
 2014-04-21 16:31:51 +00:00
Ying Wang
9953012f75 am 6fca81de: am 717884ea: (-s ours) am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 
* commit '6fca81de9b2079ec88e785f58bf49bf1f0c105e2':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
 2014-04-21 16:10:18 +00:00
Ying Wang
6fca81de9b am 717884ea: (-s ours) am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 
* commit '717884ea102e2ba7f4d35e25cc2486fd18e8a0d1':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
 2014-04-21 16:06:05 +00:00
John Spurlock
ec920b2927 am 06661993: Merge "Quick settings bug fixes." 
* commit '06661993037c28d2e189bfe809304a5d0e3ba5d8':
  Quick settings bug fixes.
 2014-04-21 15:59:32 +00:00
John Spurlock
3aba4b2d49 am 50728832: Remove obsolete settings panel artifacts. 
* commit '507288322b11ae27ab8f47438d3ef4203dad0192':
  Remove obsolete settings panel artifacts.
 2014-04-21 15:59:28 +00:00
John Spurlock
0666199303 Merge "Quick settings bug fixes." 2014-04-21 15:56:25 +00:00
Mike Lockwood
c436772120 MTP: Fix getThumbnail 
The thumbnail size was not being passed to the MTP stack so getThumbnail
was returning zero length data.

Bug: 13747419

Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
 2014-04-21 08:54:45 -07:00
Ying Wang
717884ea10 am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 
* commit '9df9ad7e29aecf88fdeb026bda07963ab6789396':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
 2014-04-21 13:45:33 +00:00
Alan Viverette
4eec347b3c am 307ad092: Add alpha to bitmap, nine patch drawable, fix container hot spots 
* commit '307ad09228ebf70f1b456f5f00540c0126277850':
  Add alpha to bitmap, nine patch drawable, fix container hot spots
 2014-04-21 13:37:31 +00:00