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

118027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
23ef1b5e0b am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '16ea3e6a5b37dc436d1089996004bcae12f5e3b0':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 08:26:15 -08:00
Narayan Kamath
96ddea413d am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '7c710936c5129664f8b23bf4592c12eca975d229':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 08:26:07 -08:00
Craig Mautner
16ea3e6a5b Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 2014-02-19 15:36:01 +00:00
Narayan Kamath
7c710936c5 Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 2014-02-19 14:24:48 +00:00
Calin Juravle
7a4172d190 am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 
* commit 'f11cc165f4d6e18d79ce013fa2f74fb43e002ac1':
  Fixed a possible infinite loop in JsonReader#skipValue()
 2014-02-19 03:18:06 -08:00
Calin Juravle
f11cc165f4 Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 2014-02-19 11:15:00 +00:00
Junu Kim
fcb87369b1 A background started service is removed from mStartingBackground when timeout. 
Fix is to make sure mStartingBackground is updated to remove one.

Change-Id: I0e42beb550d33e6e400349b85bbb89848e18d520
 2014-02-19 16:25:21 +09:00
Calin Juravle
8fbcc6b4cd Fixed a possible infinite loop in JsonReader#skipValue() 
Bug: https://code.google.com/p/android/issues/detail?id=65846

Change-Id: Idaa0e75fc5612550c4b9ccb9afa5535ea5b189df
 2014-02-18 19:19:15 +00:00
Jeff Sharkey
660a514e80 am 60097a9c: Merge "Structure device not freed in error case" 
* commit '60097a9c5a7214cb73d0bc966adef767743f8798':
  Structure device not freed in error case
 2014-02-18 09:16:31 -08:00
Jeff Sharkey
df47ecaa09 am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT" 
* commit '02a64daefece8ccdc40935c7bc865a8966249c44':
  Tethering: Skip link local addresses when enabling NAT
 2014-02-18 09:13:00 -08:00
Jeff Sharkey
e6d256c50b am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete" 
* commit '234b0b037ee1f8dc50c846279216a8e4d779ff56':
  Fix, MountService now only sends one onShutDownComplete
 2014-02-18 09:12:57 -08:00
Jeff Sharkey
60097a9c5a Merge "Structure device not freed in error case" 2014-02-18 17:12:14 +00:00
Jeff Sharkey
02a64daefe Merge "Tethering: Skip link local addresses when enabling NAT" 2014-02-18 17:11:10 +00:00
Jeff Sharkey
234b0b037e Merge "Fix, MountService now only sends one onShutDownComplete" 2014-02-18 17:10:02 +00:00
Narayan Kamath
92a09fbdeb am a14d9c31: Merge "Move Json{Reader,Writer} test to cts." 
* commit 'a14d9c318a1d358902a76aff733303c5509bb5fc':
  Move Json{Reader,Writer} test to cts.
 2014-02-17 10:23:56 -08:00
Narayan Kamath
a14d9c318a Merge "Move Json{Reader,Writer} test to cts." 2014-02-17 18:20:34 +00:00
Narayan Kamath
94ccb6bf95 Move Json{Reader,Writer} test to cts. 
These tests aren't really run automatically (or perhaps
even manually) in their present location, and increasing
CTS coverage is never a bad thing.

Change-Id: I81cce1211021011dca551fde62e725e177ca4df0
 2014-02-17 17:51:43 +00:00
Narayan Kamath
28879bbfe8 am be57fca4: Merge "Extended locales in AAPT / AssetManager." 
* commit 'be57fca41a731217010d9f92554cf48708b06ecf':
  Extended locales in AAPT / AssetManager.
 2014-02-17 03:03:49 -08:00
Narayan Kamath
183e5e038b am 49024bac: Merge "AssetManager support for 3 letter lang/country codes." 
* commit '49024bacf63db39467e7f318c682ad771ec0de22':
  AssetManager support for 3 letter lang/country codes.
 2014-02-17 03:03:46 -08:00
Narayan Kamath
be57fca41a Merge "Extended locales in AAPT / AssetManager." 2014-02-17 11:00:30 +00:00
Narayan Kamath
49024bacf6 Merge "AssetManager support for 3 letter lang/country codes." 2014-02-17 11:00:15 +00:00
Tim Murray
4870c813fe am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter." 
* commit '7d1a6c5cac16795e5953d2b4d34671e34e907632':
  Fix destruction issues relating to AllocationAdapter.
 2014-02-14 15:53:59 -08:00
Tim Murray
7d1a6c5cac Merge "Fix destruction issues relating to AllocationAdapter." 2014-02-14 23:50:08 +00:00
Tim Murray
6d63c84f44 Fix destruction issues relating to AllocationAdapter. 
bug 12971201

Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
 2014-02-14 15:48:03 -08:00
Ben Gruver
da37944785 am 509a243c: Merge "Check the return value of listFiles on the ifw directory" 
* commit '509a243c2c5ebc9cc55324bd9a03a5b560d81cfb':
  Check the return value of listFiles on the ifw directory
 2014-02-14 13:57:24 -08:00
Ben Gruver
509a243c2c Merge "Check the return value of listFiles on the ifw directory" 2014-02-14 21:15:50 +00:00
Ben Gruver
26c6b783d2 Check the return value of listFiles on the ifw directory 
listFiles can return null if the directory doesn't exist

Bug: 10497143
Change-Id: Ie4cbdf18a259a9641669a4e6b9bf49b4879acc67
 2014-02-14 13:07:11 -08:00
Tim Murray
b25a6936a1 am d7043f00: Merge "Add hidden minor version ID for support lib workarounds." 
* commit 'd7043f0084237200b6aab5d101c8ab6d3ab495c6':
  Add hidden minor version ID for support lib workarounds.
 2014-02-14 12:51:32 -08:00
Tim Murray
d7043f0084 Merge "Add hidden minor version ID for support lib workarounds." 2014-02-14 20:47:34 +00:00
Narayan Kamath
3d03e5b90d Remove java.io.tmpdir assignment in AndroidRuntime. 
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.

Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
 2014-02-14 17:42:24 +00:00
Narayan Kamath
788fa41482 Extended locales in AAPT / AssetManager. 
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.

This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.

This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.

Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.

(cherry-picked from commit 91447d88f2bdf9c2bf8d1a53570efef6172fba74)

Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
 2014-02-14 14:08:57 +00:00
Narayan Kamath
48620f1d1b AssetManager support for 3 letter lang/country codes. 
- 3 letter codes are packed into the existing 32 bit locale
  field in ResTable_config
- We introduce new fields for script / variant information.

Note that we define a "match" between two ResTable_config
structures to be purely on the basis of their language &
country (disregarding the script and the variant). However,
configs with scripts and variants are considered to be more
specific than those without.

(cherry picked from commit 378c6775a62d9c461cde51f06c1b14bb014c78fd)

Change-Id: I7dce82a3fe2412834252723f458826ae41535a78
 2014-02-14 14:08:23 +00:00
Narayan Kamath
3bec0fbb34 am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit 'fa8f95e9b96e3a12e98269c8a31ed34df6a323ca':
  AArch64: Use long for pointers in SurfaceSession class
 2014-02-14 05:14:07 -08:00
Narayan Kamath
fa8f95e9b9 Merge "AArch64: Use long for pointers in SurfaceSession class" 2014-02-14 13:10:44 +00:00
Dianne Hackborn
01de243263 am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native" 
* commit '24d8fa739b7ca0791174af260ed95cdc139e0903':
  frameworks/base: move idmap from frameworks/native
 2014-02-13 17:50:53 -08:00
Wink Saville
ea56c795b0 am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC." 
* commit 'bbba8211f9eca938d5d482583fd6e047615b4334':
  Telephony: Handle DATA_CALL_LIST in DCC.
 2014-02-13 17:50:51 -08:00
Dianne Hackborn
24d8fa739b Merge "frameworks/base: move idmap from frameworks/native" 2014-02-14 01:45:12 +00:00
Wink Saville
bbba8211f9 Merge "Telephony: Handle DATA_CALL_LIST in DCC." 2014-02-13 23:37:04 +00:00
Wink Saville
16c0b295ef am bba3a694: Merge "Telephony API extension v2" 
* commit 'bba3a694b8400fd340c0400bf42ef3d79a4285b1':
  Telephony API extension v2
 2014-02-12 20:29:01 -08:00
Wink Saville
bba3a694b8 Merge "Telephony API extension v2" 2014-02-13 04:26:33 +00:00
Nick Kralevich
93994e9db4 am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit 'a9bb594da6aff97ba927ba67a34486d0b9c1b4a0':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-12 15:12:08 -08:00
Nick Kralevich
a9bb594da6 Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 2014-02-12 23:09:37 +00:00
Dave Platt
53c7608aef am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit 'a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
  Finish fixing Zygote descriptor leakage problem
 2014-02-12 15:07:07 -08:00
Dave Platt
a3c3533b1d Merge "Finish fixing Zygote descriptor leakage problem" 2014-02-12 23:03:48 +00:00
Narayan Kamath
8fa3f44342 am 54e7f53f: Merge "Fix build." 
* commit '54e7f53fce25366781840a124aa018534c4eb52b':
  Fix build.
 2014-02-12 09:29:55 -08:00
Narayan Kamath
54e7f53fce Merge "Fix build." 2014-02-12 17:26:58 +00:00
Paul Duffin
75d67c6aa0 am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays" 
* commit 'd562a9b5160b491a9cc884f72651e46d786bdc0a':
  Improve Parcel's handling of non-primitive arrays
 2014-02-12 02:29:41 -08:00
Paul Duffin
d562a9b516 Merge "Improve Parcel's handling of non-primitive arrays" 2014-02-12 10:27:14 +00:00
Dianne Hackborn
4385d37813 Fix build. 
At least part of what is broken.  Other stuff still seems to be.

(cherry picked from 32bb5fae353b5bb6275e75952e89c514c7369cee)

Change-Id: I280376645166fe772ff7a31ff2e8494dce2adbf8
 2014-02-12 10:11:34 +00:00
Narayan Kamath
aa98fb51a8 am f991771f: Merge "Use size_t* in AssetManager::createIdmap" 
* commit 'f991771f81953f5d355eb905d05a784ed7287016':
  Use size_t* in AssetManager::createIdmap
 2014-02-12 01:40:24 -08:00