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

119544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
8c1fc83445 am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager." 
* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6':
  Extended locales in AAPT / AssetManager.
 2014-02-17 11:06:38 +00:00
Narayan Kamath
982931c72b am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/country codes." 
* commit '183e5e038bd844ac415b14f22df5c476732066c8':
  AssetManager support for 3 letter lang/country codes.
 2014-02-17 11:06:31 +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
afb4f8f144 am 8e30d53b: am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter." 
* commit '8e30d53b6575a08ec0579fb08c8c4f055598d78b':
  Fix destruction issues relating to AllocationAdapter.
 2014-02-15 00:00:07 +00:00
Tim Murray
8e30d53b65 am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter." 
* commit '4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469':
  Fix destruction issues relating to AllocationAdapter.
 2014-02-14 23:56:57 +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
d6739e0f9d am 4f416144: am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory" 
* commit '4f4161442d1ac6c1a519a06df0e4efeab3072195':
  Check the return value of listFiles on the ifw directory
 2014-02-14 23:22:13 +00:00
Tim Murray
bdb04f025c am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds." 
* commit '17b7ff4af762cd5e9921e9ee360e139956f220a5':
  Add hidden minor version ID for support lib workarounds.
 2014-02-14 23:22:10 +00:00
Ben Gruver
4f4161442d 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-02-14 23:08:10 +00:00
Tim Murray
17b7ff4af7 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-02-14 23:08:01 +00: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
6795e9c783 am 7a66d8ea: am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit '7a66d8ea7caba75b03e5a75d234a8598e2d887c6':
  AArch64: Use long for pointers in SurfaceSession class
 2014-02-14 13:20:47 +00:00
Narayan Kamath
7a66d8ea7c am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit '3bec0fbb349a969934828ee726956877a3a21dee':
  AArch64: Use long for pointers in SurfaceSession class
 2014-02-14 13:17:13 +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
Jeff Brown
f75aaf0282 am ae254a8d: am 3048191b: Remove onCreate() method that should not be there. 
* commit 'ae254a8d716b0515c5c91359a690987dfe8d5e9d':
  Remove onCreate() method that should not be there.
 2014-02-14 09:41:42 +00:00
Jeff Brown
ce0552f360 am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern. 
* commit '8a4c2bb1f07cf1d971290a7310d7b71aceb71590':
  Refactor dream manager to new pattern.
 2014-02-14 09:41:38 +00:00
Jeff Brown
ae254a8d71 am 3048191b: Remove onCreate() method that should not be there. 
* commit '3048191b4cf9eff7a72b84065dec2b3dd1e89b3c':
  Remove onCreate() method that should not be there.
 2014-02-14 09:14:15 +00:00
Jeff Brown
8a4c2bb1f0 am 567f7ca4: Refactor dream manager to new pattern. 
* commit '567f7ca424280ae957b04d4f3df690055f2d41df':
  Refactor dream manager to new pattern.
 2014-02-14 09:14:09 +00:00
Jeff Brown
3048191b4c Remove onCreate() method that should not be there. 
Change-Id: I8355dd78f910afa9895d2fa00cb627a0885d9eec
 2014-02-13 23:26:59 -08:00
Jeff Brown
567f7ca424 Refactor dream manager to new pattern. 
Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
 2014-02-13 23:26:59 -08:00
Dianne Hackborn
6231c948b0 am dc3561df: am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native" 
* commit 'dc3561df118a17a099285c9be312fb66f91314ec':
  frameworks/base: move idmap from frameworks/native
 2014-02-14 02:00:49 +00:00
Wink Saville
df10f02a14 am e574f7de: am ea56c795: am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC." 
* commit 'e574f7decf7bc2c6861aff2fd4458b9f96a08a28':
  Telephony: Handle DATA_CALL_LIST in DCC.
 2014-02-14 02:00:46 +00:00
Dianne Hackborn
dc3561df11 am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native" 
* commit '01de243263d347f2ac13a239d67d41817e34df33':
  frameworks/base: move idmap from frameworks/native
 2014-02-14 01:54:49 +00:00
Wink Saville
e574f7decf am ea56c795: am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC." 
* commit 'ea56c795b0b4997f5835ec42a18eccdb173bc468':
  Telephony: Handle DATA_CALL_LIST in DCC.
 2014-02-14 01:54:43 +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
Craig Mautner
3816fa8bee am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev 
* commit '21ab13ff743fda1cec1923a8dec6b5553a514759':
  Don't null class member before using it.
 2014-02-13 19:21:41 +00:00
Craig Mautner
21ab13ff74 am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev 
* commit '474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
  Don't null class member before using it.
 2014-02-13 19:18:04 +00:00
Craig Mautner
474f1fbe8d Merge "Don't null class member before using it." into klp-modular-dev 2014-02-13 19:14:17 +00:00
Craig Mautner
991146f8ef Don't null class member before using it. 
Changing the order of detachStack() and usage of mDisplayContent
fixes NPE.

Fixes bug 12823709.

Change-Id: I04760b1d6fd5d3ffc49b99ca4acb47bf7e61cb46
 2014-02-13 11:12:42 -08:00
Craig Mautner
4dd839756c am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev 
* commit 'd14fa78dc84507fbdee8507205a3aff40296d328':
  Update DimLayer sizes on rotation.
 2014-02-13 19:10:15 +00:00
Craig Mautner
d14fa78dc8 am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev 
* commit '0af894d25133890e7765e6c582b3ac4829070de8':
  Update DimLayer sizes on rotation.
 2014-02-13 19:05:18 +00:00
Craig Mautner
0af894d251 Merge "Update DimLayer sizes on rotation." into klp-modular-dev 2014-02-13 19:02:02 +00:00
Craig Mautner
b660b9d8cf Update DimLayer sizes on rotation. 
Required replumbing and updating the TaskStack bounds calculations
to match the new separation of TaskStack from DisplayContent.

Fixes bug 12780687.

Change-Id: I061c92831c06f4eb3e673ad6296e721b0c0f3202
 2014-02-13 10:59:16 -08:00
Wink Saville
396b9e792f am 27bf55c8: am 16c0b295: am bba3a694: Merge "Telephony API extension v2" 
* commit '27bf55c8159e7f883ddc839453d5a12374ddc50a':
  Telephony API extension v2
 2014-02-13 08:49:13 +00:00