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

162112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
f9c11d904f Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-06 18:33:30 +00:00
Geoff Mendal
88bc51ffca Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-06 18:32:35 +00:00
Geoff Mendal
ec76311837 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-06 18:32:19 +00:00
Geoff Mendal
c1a064dd94 Import translations. DO NOT MERGE 
Change-Id: I391b269b0d535fa7d8a4082cb0271b0aeb16a497
Auto-generated-cl: translation import
 2014-10-06 10:56:58 -07:00
Geoff Mendal
a6fa396adc Import translations. DO NOT MERGE 
Change-Id: Id44a50fdb0bd6b01fa0a3930647b310dd44d4674
Auto-generated-cl: translation import
 2014-10-06 10:56:03 -07:00
Geoff Mendal
f65288da06 Import translations. DO NOT MERGE 
Change-Id: Ieb7aeaea1204f4ba7daf3abd7a30f647564807dd
Auto-generated-cl: translation import
 2014-10-06 10:55:10 -07:00
John Spurlock
78cc93ec80 Merge "Fix NPE in StrictMode handling." into lmp-dev 2014-10-06 17:54:41 +00:00
Geoff Mendal
86dec04749 Import translations. DO NOT MERGE 
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
Auto-generated-cl: translation import
 2014-10-06 10:54:01 -07:00
Andrew Solovay
2dd86d50ae Merge "Removed preview license." into lmp-dev 2014-10-06 17:51:53 +00:00
Adam Powell
b6cdbcda1b am 95891d26: am 00092db1: Fix build breakage in API check 
* commit '95891d2602585205eaad5cdabe89f45c6ed8504c':
  Fix build breakage in API check
 2014-10-06 17:21:50 +00:00
Adam Powell
95891d2602 am 00092db1: Fix build breakage in API check 
* commit '00092db1af06d0434cae88aa736be9ed539e2a9c':
  Fix build breakage in API check
 2014-10-06 17:17:36 +00:00
Adam Powell
00092db1af Fix build breakage in API check 
Change-Id: I0fe7849b8b834fb32b13e60657685f72d1110d21
 2014-10-06 10:11:43 -07:00
Yuncheol Heo
cec3ad8fdc am a4b895a1: am 345f3d00: am 4cb8455f: am 71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev 
* commit 'a4b895a18b91959e06b9ef3e634106091e2acb56':
  CEC: Reset active source status on routing control
 2014-10-06 16:52:31 +00:00
Benjamin Franz
adabf536fb am 00fcb749: am 31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev 
* commit '00fcb749cbd26c83d1a29a974bd92967b41c5882':
  Introduce new API to get an unbadged icon and unbadge permissions.
 2014-10-06 16:52:27 +00:00
Yuncheol Heo
a4b895a18b am 345f3d00: am 4cb8455f: am 71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev 
* commit '345f3d00b8dccb68988bdf9f6fb069fcfe06bb24':
  CEC: Reset active source status on routing control
 2014-10-06 16:47:14 +00:00
Benjamin Franz
00fcb749cb am 31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev 
* commit '31409c0ccd1434efdcfff8f7ddcd7c4207660104':
  Introduce new API to get an unbadged icon and unbadge permissions.
 2014-10-06 16:47:11 +00:00
John Spurlock
9bb3dacbf9 Fix NPE in StrictMode handling. 
Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
 2014-10-06 12:36:45 -04:00
PauloftheWest
6cdeaa0d03 Fixed a Bluetooth Quick Settings update bug. 
+ Now when a Bluetooth device disconnects, and the user is looking at quick
settings, the Bluetooth icon and text will update with the new state of
diconnected.

Bug: 17677593
Change-Id: Iccaf16a23f7e0b8690a32945906a9ccc2382cdd0
 2014-10-06 09:31:48 -07:00
Yuncheol Heo
345f3d00b8 am 4cb8455f: am 71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev 
* commit '4cb8455fba9b70339bacf28ff813118ad542165d':
  CEC: Reset active source status on routing control
 2014-10-06 16:30:02 +00:00
Benjamin Franz
31409c0ccd Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev 2014-10-06 16:26:27 +00:00
Yuncheol Heo
4cb8455fba am 71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev 
* commit '71c4578def00a5a4b9e159fd1ab88e616bc7e159':
  CEC: Reset active source status on routing control
 2014-10-06 16:22:17 +00:00
Yuncheol Heo
71c4578def Merge "CEC: Reset active source status on routing control" into lmp-dev 2014-10-06 16:16:47 +00:00
Jinsuk Kim
995fcfc591 CEC: Reset active source status on routing control 
Set active source status to false when broadcast routing control
commands indicate other device is about to be the new active source.

Bug: 17840270
Change-Id: I176e21ec8789624e29421b912ba641a21f0f5f21
 2014-10-06 14:53:07 +09:00
Jeff Sharkey
6da9182fae am 97e18d56: am ce85d7f4: am b03b9759: am 4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev 
* commit '97e18d563844f7d2a7669e0129edc4bf425bf25b':
  Recover from missing upgrade to system package.
 2014-10-06 04:29:25 +00:00
Jeff Sharkey
97e18d5638 am ce85d7f4: am b03b9759: am 4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev 
* commit 'ce85d7f44f5c88dcc18a19738bfcd20d9dbb4a78':
  Recover from missing upgrade to system package.
 2014-10-06 04:25:38 +00:00
Jeff Sharkey
ce85d7f44f am b03b9759: am 4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev 
* commit 'b03b9759d3ec1f3dacde71314795a3451f67fbab':
  Recover from missing upgrade to system package.
 2014-10-06 04:17:05 +00:00
Jeff Sharkey
b03b9759d3 am 4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev 
* commit '4c88087776305f54bec0aae59b8e63bc803c1401':
  Recover from missing upgrade to system package.
 2014-10-06 04:08:57 +00:00
Jeff Sharkey
4c88087776 Merge "Recover from missing upgrade to system package." into lmp-dev 2014-10-06 04:01:34 +00:00
Wonsik Kim
e0165fdb3b am a83bf228: am aa4b0d82: TIF: fix retrieving sinkConfig 
* commit 'a83bf228b77fd421c7064fca5cce178a6cbe7323':
  TIF: fix retrieving sinkConfig
 2014-10-06 02:40:38 +00:00
Wonsik Kim
a83bf228b7 am aa4b0d82: TIF: fix retrieving sinkConfig 
* commit 'aa4b0d82a1fdb92fbf4f8852f326f2687ee55fa7':
  TIF: fix retrieving sinkConfig
 2014-10-06 02:15:14 +00:00
Wonsik Kim
aa4b0d82a1 TIF: fix retrieving sinkConfig 
Bug: 17399450
Change-Id: I9d2f88de0fc967faeede853028f74478f4fa8f24
 2014-10-06 10:02:35 +09:00
Jeff Sharkey
1c13310577 Recover from missing upgrade to system package. 
When a system app has been upgraded, we mark the built-in version as
disabled, and skip it when parsing built-in apps, since we expect
the userdata version to be scanned a few moments later.

However, in very rare cases we can end up missing the expected
userdata version, and we'd end up dropping the package entirely, even
though we have a built-in version to fall back to.  This change
handles that case by rescanning and enabling the built-in version when
the userdata version never materializes.

Also include critical log messages in check-in dumpsys to help track
down how we ended up in this state.

Bug: 17805839
Change-Id: I9971f882f9bb8ab7934c20b04e0b72366c4d04d0
 2014-10-05 14:12:45 -07:00
Baligh Uddin
00bc4bada9 am ec589559: (-s ours) am f7a9072e: (-s ours) am a37450f0: (-s ours) am ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ec5895592b586007adf9902568d4ee1e6c53dbed':
  Import translations. DO NOT MERGE
 2014-10-05 18:16:45 +00:00
Baligh Uddin
07c784da81 am 51647ece: (-s ours) am 26e89553: (-s ours) am e823992f: (-s ours) am 9e32249d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '51647ece0c6dae2fbdafbfa856cfc5de65894453':
  Import translations. DO NOT MERGE
 2014-10-05 18:16:41 +00:00
Baligh Uddin
90f6ed82ad am 491c11ba: (-s ours) am 0da4783c: (-s ours) am 8b5a7318: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '491c11baa49d6aebf808eddf94878c482fc8087c':
  Import translations. DO NOT MERGE
 2014-10-05 18:12:09 +00:00
Baligh Uddin
ec5895592b am f7a9072e: (-s ours) am a37450f0: (-s ours) am ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f7a9072e97822c67daf37a624c75512ff7e5e5ec':
  Import translations. DO NOT MERGE
 2014-10-05 18:10:11 +00:00
Baligh Uddin
51647ece0c am 26e89553: (-s ours) am e823992f: (-s ours) am 9e32249d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '26e89553489b962ad587c80ca326829a596b6ea6':
  Import translations. DO NOT MERGE
 2014-10-05 18:10:08 +00:00
Baligh Uddin
2b0ffbc0c4 am 9acd8b26: (-s ours) am 80a37a53: (-s ours) am 2f9d6c64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '9acd8b2652fa615bda4c033e70cb15722ef49ce4':
  Import translations. DO NOT MERGE
 2014-10-05 18:07:46 +00:00
Baligh Uddin
491c11baa4 am 0da4783c: (-s ours) am 8b5a7318: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '0da4783cb72ed1e3cbf4fe0e1c9abf66a07b9b4b':
  Import translations. DO NOT MERGE
 2014-10-05 18:05:56 +00:00
Baligh Uddin
f7a9072e97 am a37450f0: (-s ours) am ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a37450f044dee6b6f7c5568cc815a988de4e90fc':
  Import translations. DO NOT MERGE
 2014-10-05 18:05:02 +00:00
Baligh Uddin
26e8955348 am e823992f: (-s ours) am 9e32249d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e823992f94d69936c926f5c00a85a4d3dbfe0a93':
  Import translations. DO NOT MERGE
 2014-10-05 18:04:53 +00:00
Baligh Uddin
9acd8b2652 am 80a37a53: (-s ours) am 2f9d6c64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '80a37a53c74c9193d5eb4807ced4c49a034b791f':
  Import translations. DO NOT MERGE
 2014-10-05 18:01:52 +00:00
Baligh Uddin
a37450f044 am ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ec3ce59c16369aa8ce63da7070be3cd5a6d8cc75':
  Import translations. DO NOT MERGE
 2014-10-05 17:59:57 +00:00
Baligh Uddin
0da4783cb7 am 8b5a7318: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '8b5a7318ff91c01b759f49aa8c9e1207d3ce90dc':
  Import translations. DO NOT MERGE
 2014-10-05 17:59:54 +00:00
Baligh Uddin
4489933b70 am 194f0e1b: (-s ours) am 334c6232: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '194f0e1baac02dfc0886f6d09605348151a34f31':
  Import translations. DO NOT MERGE
 2014-10-05 17:58:24 +00:00
Baligh Uddin
36ec328d5c am 650f5b91: (-s ours) am 98aa668a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '650f5b91dc8bf30860c55c7ad6d04e73feed0d2a':
  Import translations. DO NOT MERGE
 2014-10-05 17:58:21 +00:00
Baligh Uddin
0a70d91955 am eb5618fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'eb5618fa21aadad1d99a4cc3c86ca08579ffb9f4':
  Import translations. DO NOT MERGE
 2014-10-05 17:58:15 +00:00
Baligh Uddin
b32f69b791 am cd2fd7f0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'cd2fd7f032d4781a4d12e3f5d991d0e69563a60f':
  Import translations. DO NOT MERGE
 2014-10-05 17:53:17 +00:00
Baligh Uddin
194f0e1baa am 334c6232: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '334c6232e8ecf978ddec4e24bd3c1af24c24a1fd':
  Import translations. DO NOT MERGE
 2014-10-05 17:53:03 +00:00
Baligh Uddin
650f5b91dc am 98aa668a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '98aa668ab99f9cb9f939c8310f78d459be7a9696':
  Import translations. DO NOT MERGE
 2014-10-05 17:53:00 +00:00