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

119285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calin Juravle
801b3542c7 am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit '7a4172d190871c6b17124bf86374304cef727984':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-03-07 19:40:23 +00:00
Jeff Sharkey
a8e39c76a6 am 660a514e: am 60097a9c: Merge "Structure device not freed in error case" 
* commit '660a514e80e0019d8c6632e84bd03491722fc2ab':
  Structure device not freed in error case
 2014-03-07 19:39:52 +00:00
Jeff Sharkey
6101c3c8f3 am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT" 
* commit 'df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
  Tethering: Skip link local addresses when enabling NAT
 2014-03-07 19:39:49 +00:00
Jeff Sharkey
3f81ee6f54 am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete" 
* commit 'e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
  Fix, MountService now only sends one onShutDownComplete
 2014-03-07 19:39:45 +00:00
Narayan Kamath
c73480ef68 am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts." 
* commit '92a09fbdebae5362633db281bc155ed1f1145588':
  Move Json{Reader,Writer} test to cts.
 2014-03-07 19:39:35 +00:00
Narayan Kamath
d5b9bcb60d am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager." 
* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6':
  Extended locales in AAPT / AssetManager.
 2014-03-07 19:39:13 +00:00
Narayan Kamath
f214b4cccb am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/country codes." 
* commit '183e5e038bd844ac415b14f22df5c476732066c8':
  AssetManager support for 3 letter lang/country codes.
 2014-03-07 19:39:09 +00:00
Tim Murray
8829fc06ca am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter." 
* commit '4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-07 19:38:48 +00:00
Ben Gruver
24ad70598e am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory" 
* commit 'da37944785c47b2b92c1a0f79c5d602256859fe6':
  Check the return value of listFiles on the ifw directory
 2014-03-07 19:38:42 +00:00
Tim Murray
d8b0c65717 am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds." 
* commit 'b25a6936a1b0dbabaf8ad8c2ce59e7251daa9e8c':
  Add hidden minor version ID for support lib workarounds.
 2014-03-07 19:38:35 +00:00
Narayan Kamath
d556b42909 am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit '3bec0fbb349a969934828ee726956877a3a21dee':
  AArch64: Use long for pointers in SurfaceSession class
 2014-03-07 19:34:28 +00:00
Dianne Hackborn
8392e7e287 am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native" 
* commit '01de243263d347f2ac13a239d67d41817e34df33':
  frameworks/base: move idmap from frameworks/native
 2014-03-07 19:33:55 +00:00
Wink Saville
a6f527b941 am ea56c795: am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC." 
* commit 'ea56c795b0b4997f5835ec42a18eccdb173bc468':
  Telephony: Handle DATA_CALL_LIST in DCC.
 2014-03-07 19:33:42 +00:00
Sungmin Choi
5d37e0d1b4 telephony: Add same named operator configuration for some operators 
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
 2014-03-07 11:29:18 -08:00
Vineeta Srivastava
7e4bf2b06e Merge commit '3d924f1e' into manualmerge 2014-03-07 11:07:20 -08:00
Vineeta Srivastava
3d924f1e8d am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 
* commit 'ef86ff58178e876f1dfbedd65166cc806f006ba8':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
 2014-03-07 18:40:53 +00:00
Vineeta Srivastava
ef86ff5817 Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev 2014-03-07 18:37:42 +00:00
Sungmin Choi
22ec0dc353 Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE] 
This reverts commit 119e24f98706cb0a1217b41e7e750b94c1a8941a.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
 2014-03-07 18:37:26 +00:00
Leon Scroggins III
5eea60a0ef am 74ca3fd3: am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit '74ca3fd34dac9674f61313594e2863ffecd79c7a':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:31:39 +00:00
Dianne Hackborn
731ef29831 am 8e904d56: am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '8e904d565e8a54f755814e9ae062743b8b012731':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:31:36 +00:00
Andy McFadden
91e0facf79 am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit 'cda61e95f6b600378ab64f43beb42dbbfa2f6a1a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 18:31:33 +00:00
Chris Wren
48ef4b2dc3 am 111e981d: am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit '111e981dc7f7d62647d6aa5e6c44cfd13af53608':
  use relative positioning for notification actions
 2014-03-07 18:31:29 +00:00
Marco Nelissen
7e7f65b40f am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev 
* commit '233e7e9f64be5e85196dd959824bce9a69b2fd99':
  ExifInterface: fix class load failure
 2014-03-07 18:31:14 +00:00
Dianne Hackborn
cd8a7dee2e am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 
* commit '278fa87cc9a5e08d410c5b1e6c75afcffc22a988':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
 2014-03-07 18:31:10 +00:00
Svetoslav
09279ece2f am d2a244f9: am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev 
* commit 'd2a244f9767ee678d3971c9ad43a07100db4e8c9':
  ProgressBar is important for accessibility by default.
 2014-03-07 18:31:04 +00:00
Marco Nelissen
6087c51da8 am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev 
* commit '4f36104f06755dc2c95b3d7c8bac5312d7572199':
  libexif is now libjhead
 2014-03-07 18:31:01 +00:00
Jay Shrauner
94c349d816 am 1276295b: am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE 
* commit '1276295b6b157b583480fbdf2be72b9bc0fb1c54':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE
 2014-03-07 18:30:52 +00:00
Leon Scroggins III
6bf9ef8c06 am 87e9e744: am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit '87e9e744ed7acc554a6b4c7dd90fab376eabb30b':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-07 18:30:43 +00:00
Marco Nelissen
aefa427c27 Make MtpDatabase use libexif instead of libjhead 
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
 2014-03-07 10:30:23 -08:00
Leon Scroggins III
42ae4cf2ce Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into klp-dev-plus-aosp 2014-03-07 18:26:19 +00:00
Leon Scroggins III
74ca3fd34d am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit 'bc57651fb510d7b1a2811235f96e711b6be12a12':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:15:23 +00:00
Dianne Hackborn
8e904d565e am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:15:19 +00:00
Leon Scroggins III
bc57651fb5 Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 2014-03-07 18:13:29 +00:00
Dianne Hackborn
785d764bd5 Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 2014-03-07 18:12:30 +00:00
Andy McFadden
cda61e95f6 am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit 'faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 17:43:40 +00:00
Andy McFadden
faddd77a91 Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 2014-03-07 17:40:40 +00:00
Craig Mautner
2c82c08a54 Show the keyguard if unsecure window on top. DO NOT MERGE. 
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
 2014-03-07 09:09:27 -08:00
Leon Scroggins III
278250dafb DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 
BUG:13191516

Original CLs below:

In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

-------------------------------------------------------------------------

Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
   The old behavior would have continued to modify the
   file descriptor's offset each time a new decode was
   required. The copy ensures that the file descriptor
   remains unchanged.
3. Buffer the file stream.
   Prior to this change, if the image was not a PNG,
   the stream would be rewound to the beginning of the
   file, even if the file descriptor was passed in with
   an offset. Thanks to the buffer, the stream is only
   rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
 2014-03-07 11:28:44 -05:00
Narayan Kamath
51ec4ec51f am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit '5de03b18ea455c0250cbd01912282f28d8635910':
  Don't assume that size_t is 32-bit
 2014-03-07 08:08:21 -08:00
Narayan Kamath
6ac6263dcc am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit '28ccb4f7d9bbea65c8cb1807e332a46ef37bc619':
  Don't use size_t for variables that store uint32_t value
 2014-03-07 08:08:18 -08:00
Narayan Kamath
cd4874cfdc am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit 'd265bcc4b555ab75009f8ceb32cc90007a621b41':
  Inform libcore of time format pref. changes.
 2014-03-07 08:08:05 -08:00
Narayan Kamath
5de03b18ea Merge "Don't assume that size_t is 32-bit" 2014-03-07 16:04:50 +00:00
Narayan Kamath
28ccb4f7d9 Merge "Don't use size_t for variables that store uint32_t value" 2014-03-07 16:04:28 +00:00
Chris Wren
111e981dc7 am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit '70d5ed269268c1da6169b49b555d7295ac5d6763':
  use relative positioning for notification actions
 2014-03-07 15:10:47 +00:00
Chris Wren
70d5ed2692 Merge "use relative positioning for notification actions" into klp-dev 2014-03-07 15:08:29 +00:00
Narayan Kamath
d265bcc4b5 Merge "Inform libcore of time format pref. changes." 2014-03-07 13:50:04 +00:00
Narayan Kamath
27ad525c7e Inform libcore of time format pref. changes. 
- Introduce a boolean extra for intent TIME_CHANGED that
  specifies if the user wants a 24 hour format or not.
- Have the ActivityManagerService inform running processes
  of changes to this preference.
- Add plumbing in ActivityThread to inform j.t.DateFormat

Change-Id: I05fafb903ae54e39c03a048b7a219dc5a93fd472
 2014-03-07 13:48:04 +00:00
Wink Saville
4ee594e305 am 16c0b295: am bba3a694: Merge "Telephony API extension v2" 
* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
  Telephony API extension v2
 2014-03-07 02:30:08 +00:00
Nick Kralevich
943822c93a am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '93994e9db44a30402bd596764163d81ee1b1fd30':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-03-07 02:29:42 +00:00
Dave Platt
9eca7f8fbc am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit '53c7608aefb0ed754394e571cac02e96ad6fcdb3':
  Finish fixing Zygote descriptor leakage problem
 2014-03-07 02:29:30 +00:00