Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
eda011d95a Merge "Import translations. DO NOT MERGE" 2014-11-07 15:49:18 +00:00
Baligh Uddin
8c49bac3fa Merge "Import translations. DO NOT MERGE" 2014-11-07 15:45:45 +00:00
Baligh Uddin
22688a786b Merge "Import translations. DO NOT MERGE" 2014-11-07 15:45:45 +00:00
Baligh Uddin
326b291988 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:45:43 +00:00
Baligh Uddin
c805d3599b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:45:39 +00:00
Baligh Uddin
637176877e Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-07 15:45:37 +00:00
Baligh Uddin
61ef41a7a1 Merge "Import translations. DO NOT MERGE" 2014-11-07 15:45:32 +00:00
Mårten Kongstad
cb7b63d928 RRO: prevent duplicate system overlays 
System overlays, ie overlays with targetPackage="android", were loaded
twice, which caused all sorts of issues. Ensure they are only loaded
once, which will be during Zygote initialization.

Bug: 17765434
Change-Id: Ia5064045c77f713c58fb78adc3942f6af1abdc93
 2014-11-07 16:08:22 +01:00
Mårten Kongstad
96198ebae8 RRO idmap: pad with 0xffffffff, not 0x00000000 
In the new idmap format (version 0x1), 0x00000000 no longer represents a
non-existing entry: 0xffffffff should be used instead.

Bug: 17765434
Change-Id: If2c7e09feba2224eeafe88fd9230e6392d81b9a7
 2014-11-07 16:08:04 +01:00
Mårten Kongstad
30113131fb RRO: reintroduce lost ResTable insert of assets 
With the recent introduction of AssetManager::appendPathToResTable,
overlay packages were not properly added to the AssetManager, and once
added, were not properly inserted into the ResTable.

Bug: 17765434
Change-Id: Ie21f227c654c98730f74a687d0e16ee2b80e747e
 2014-11-07 16:07:42 +01:00
Mårten Kongstad
840796a3c2 RRO tests: fix potential NPE 
Bug: 17765434

Check for null before closing streams.

Change-Id: I651785649575725009f270d4d8eb5f4bf90952a6
 2014-11-07 16:07:21 +01:00
Mårten Kongstad
97b5df7643 RRO tests: adapt tests to split apks 
The introduction of support for split apks has resulted in the move of
applications from /partition/app/pkg.apk to /partition/app/pkg/pkg.apk.
Update the RRO testrunner to use the new paths.

Bug: 17765434
Change-Id: I6eebfb6f879404077b9447c750ddc395ecd9a547
 2014-11-07 16:06:18 +01:00
Jörgen Ekström
da44fe0e1f Fixing NULL pointer access causing segmentation fault in aapt 
In cases where resource packages are generated which does
not have public resources for all resource types - NULL
pointers sneaks into the mOrderedConfigs vector causing
the aapt tool to crash. The solution in this fix simply
ignores the NULL elements when later processing the sorted
vector.

The NULL elements are inserted during applyPublicEntryOrder
function call

Change-Id: I8b7135932e2d235018da2e2f7e09f0d22f1b2f59
 2014-11-07 13:41:06 +00:00
Mattias Petersson
fc2bd335d1 Fix for CharSequenceCreator test case 
The test case testCharSequenceCreator() in TextUtilsTest fails
because the data position is not reset before calling
createFromParcel().

Change-Id: I6d5cc093ff65019ab0d2191bb0bd9c10ae49612b
 2014-11-07 12:27:28 +00:00
Ignacio Solla
0aba408a81 am ad87ec5b: am cf045ea8: am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit 'ad87ec5bbaa911c364a1b9626c7e89de71e47552':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:14:53 +00:00
Ignacio Solla
ad87ec5bba am cf045ea8: am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit 'cf045ea8e4b91ac662d0aff74df429a2569d8e46':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:08:22 +00:00
Ignacio Solla
cf045ea8e4 am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit '803908b0db0139a2bc3eca2868cad67c9a274d97':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:01:08 +00:00
Baligh Uddin
b4c33100e9 Import translations. DO NOT MERGE 
Change-Id: Icd6c1b82cc23c4b1e5bef13ddab6452a668b70c3
Auto-generated-cl: translation import
 2014-11-07 02:00:31 -08:00
Baligh Uddin
3f9b1a3ed7 Import translations. DO NOT MERGE 
Change-Id: I2fa15a37c0b29c068dfa413490028f09d5de5ae2
Auto-generated-cl: translation import
 2014-11-07 01:58:59 -08:00
Baligh Uddin
ddfe33b690 Import translations. DO NOT MERGE 
Change-Id: Iae4fdd5608681f999b8b8234262b6da60d79eea2
Auto-generated-cl: translation import
 2014-11-07 01:50:28 -08:00
Baligh Uddin
ca372ca7f8 Import translations. DO NOT MERGE 
Change-Id: I3019f8f80cdeb209aa4f7903b149743af1b1473e
Auto-generated-cl: translation import
 2014-11-07 01:47:40 -08:00
Ignacio Solla
803908b0db Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 2014-11-07 09:44:59 +00:00
Baligh Uddin
31b3de0d95 Import translations. DO NOT MERGE 
Change-Id: Ic6355a1f0a89aadd602b3cfa6660f735f6d04d7b
Auto-generated-cl: translation import
 2014-11-07 01:44:33 -08:00
Baligh Uddin
03e554b4f1 Import translations. DO NOT MERGE 
Change-Id: Iaaa6b27c60a7641bc236b062976f1b4ffd9e55d5
Auto-generated-cl: translation import
 2014-11-07 01:40:15 -08:00
Baligh Uddin
ddb7653abd Import translations. DO NOT MERGE 
Change-Id: Ic184c5ac9f0ef908ed5fec4afefb7cec8ce8e8ad
Auto-generated-cl: translation import
 2014-11-07 01:29:06 -08:00
Baligh Uddin
ea2e426c34 Import translations. DO NOT MERGE 
Change-Id: I2994323e16b360c821f3f314bc42258818f20905
Auto-generated-cl: translation import
 2014-11-07 01:26:08 -08:00
Baligh Uddin
26d1b9f0e2 Import translations. DO NOT MERGE 
Change-Id: I10758afed9ae7840161330a496b31ad3da2627d9
Auto-generated-cl: translation import
 2014-11-07 01:24:17 -08:00
Baligh Uddin
e6ac0cd883 Import translations. DO NOT MERGE 
Change-Id: I2cd2b6ae9fb2a5114ee931d03e7d1f5aff0bc1e6
Auto-generated-cl: translation import
 2014-11-06 23:26:52 -08:00
Baligh Uddin
d3531b9880 Import translations. DO NOT MERGE 
Change-Id: I353eea105f85b0d45a2dd0f45b84921462c87c89
Auto-generated-cl: translation import
 2014-11-06 23:19:45 -08:00
Baligh Uddin
a8b1305363 Import translations. DO NOT MERGE 
Change-Id: Id09faf98f305e5319eecc2d18b25ccde8aed55c1
Auto-generated-cl: translation import
 2014-11-06 23:11:55 -08:00
Mathias Jeppsson
2d2d8c2854 Dont call close in in BluetoothA2dp finalize 
The close in finalize() is pointless, as finalize() will only be called
if there are no references to BluetoothA2dp. Until close() is called,
BluetoothManagerService will have a reference to BluetoothA2dp,
preventing garbage collection and finalize() to be called. This means
finalize() is not serving its purpose of cleaning up in cases close()
is not called, as finalize() is only called if close() has already
been called.

Actually calling close in finalize here means unregistering the already
unregistered mBluetoothStateChangeCallback which can lead to crashes
when pairing/unpairing BTH. A typical crash would look like:

*** FATAL EXCEPTION IN SYSTEM PROCESS: BluetoothManager
java.lang.NullPointerException
at android.os.RemoteCallbackList.unregister(RemoteCallbackList.java:143)
at com.android.server.BluetoothManagerService$BluetoothHandler.handleMessage(BluetoothManagerService.java:780)
at android.os.Handler.dispatchMessage(Handler.java:99)

Change-Id: Ib65962917ecbacf7900d7fe540057e6915f0532d
 2014-11-07 07:02:50 +00:00
Baligh Uddin
4ba5e94e78 Import translations. DO NOT MERGE 
Change-Id: Ib9e93cba1660b5f0b1393f81ddbffe50876f1b53
Auto-generated-cl: translation import
 2014-11-06 23:00:37 -08:00
Alexander Toresson
545a8bbe70 Fix error overwriting when restoring error 
onRestoreInstanceState restores the old error, after layout has been
done. A new error may have been set before this is done, which thus
overwrites the new error.

This patch prevents the new error from being overwritten.

Change-Id: I8e7c91b5da27310fb6698e671d1f7d78ee268061
 2014-11-07 07:00:05 +00:00
Baligh Uddin
b25b3ffd92 Import translations. DO NOT MERGE 
Change-Id: I897991ab8499a1a73219e861c365771fc7eb905e
Auto-generated-cl: translation import
 2014-11-06 22:54:44 -08:00
Quddus Chong
243bccc927 am 402a1404: am 63bafb39: am fedaef0d: am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f 
* commit '402a14047af1720c7f452507cebf135ed1a346b8':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 04:44:22 +00:00
Jim Miller
b6b3cb9910 am 73d43681: am eae9dc3b: am c6f5009f: Merge "Fix build" into lmp-mr1-dev 
* commit '73d4368119391c93ce59cb2d5f78174ce1f6dc92':
  Fix build
 2014-11-07 04:44:08 +00:00
Andrew Lee
e57e8e658a am a56fa73c: am 8f34e65a: am a70688f2: Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev 
* commit 'a56fa73c30b4756068fbb6578668e39fb2f5c235':
  Replace onConferenceChanged with onConnectionAdded.
 2014-11-07 04:17:56 +00:00
Winson Chung
c5f9ec3e27 am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 04:17:02 +00:00
Winson Chung
f3fefc6195 am d42e7b57: am c0542a96: am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 
* commit 'd42e7b57de7bb3323aa6c0d680378da000664a07':
  Fixing Recents crash when resetting focus of TaskView already returned to the pool.
 2014-11-07 04:16:57 +00:00
Anthony Lee
d997d01276 am 55b1eb84: am 0b948550: am 30e65842: Change access to removeConnection so we can override it. 
* commit '55b1eb84d03eb8f7dbf47f46d4e0228175d4578d':
  Change access to removeConnection so we can override it.
 2014-11-07 04:16:33 +00:00
Brian Carlstrom
900b2d913c am bb7388a8: am 14531903: am f4d2c8ee: Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev 
* commit 'bb7388a86e8e9782cf8caf4d176cd2b8d16d752b':
  Restore mLazyDexOpt behavior for eng builds
 2014-11-07 04:15:39 +00:00
Andre Eisenbach
adc258e061 am b1b6ca5a: am b6523d83: am 44c11b9d: am df11d588: Fix crash during Bluetooth on/off stress test 
* commit 'b1b6ca5a022665b745e6ea1399b9ecc542776e9c':
  Fix crash during Bluetooth on/off stress test
 2014-11-07 04:15:34 +00:00
Amit Mahajan
714098025a am b34892e1: am b0abe26d: am fc3f2380: Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 
* commit 'b34892e1a07a6e3537fbd1f384ef9240a85aabd7':
  Add configuration to control converting sms destination number
 2014-11-07 04:15:21 +00:00
Luan Nguyen
38ba9213a5 am b97dbd2e: am f8263432: am df8daa8c: am db212613: am 816b93cf: am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs 
* commit 'b97dbd2e3af132a9f5722519c091c9594fee40d8':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
 2014-11-07 04:15:15 +00:00
Joe Fernandez
f54ce6b046 am 03bfc4d3: am 5f7cf91f: am 0171ad2b: am 5851fb9b: am d00ce6c5: am 1d295821: docs: fix for Brand inquiries form 
* commit '03bfc4d3ff09019bb6b7a43afd9226d0ecf10e98':
  docs: fix for Brand inquiries form
 2014-11-07 04:15:10 +00:00
Andres Morales
c4e222c84b am 7c711415: (-s ours) am 98b07343: am 3e5d6aa0: am f33d9db4: am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 
* commit '7c711415059c975d87b7fc4cff362b2bd48fd5bf':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
 2014-11-07 04:12:11 +00:00
Jason Parks
05e095ae08 am e8d0fe98: am ae61ea93: am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev 
* commit 'e8d0fe98a6d39c545467f679f0000b500ec7d341':
  Fix NPE for CTS.
 2014-11-07 04:12:06 +00:00
Jeff Hao
6ab96b39d0 am 48db836d: am 2140dc7e: am c02d9a73: am 2a83226c: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev 
* commit '48db836d8972cf810d63f92fb5605b82abe1cb2a':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-11-07 04:12:02 +00:00
Rich Slogar
3fe7241374 am 085c4809: am 7ac41ce3: am 1d793503: am d47ab00c: am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit '085c48098568f1c9619ea882432c6a09d2239b5f':
  docs:Remove tools/index.jd file.
 2014-11-07 04:11:57 +00:00
Quddus Chong
402a14047a am 63bafb39: am fedaef0d: am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f 
* commit '63bafb39bc64f671d686190985964f978a8cbd45':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 04:10:46 +00:00