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

154870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
aece3ec511 am ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ce2b1e8cfaa67f27502d4db837d197409453aae4':
  Import translations. DO NOT MERGE
 2014-10-06 19:28:44 +00:00
Jorim Jaggi
8cc8dfed32 Update 'No notifications' text on configuration change 
Bug: 17821946
Change-Id: Ia4518426ce059be5312d652bb27bbe11a1626518
 2014-10-06 12:27:55 -07:00
Amit Mahajan
15c581fa4c am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev 
* commit '17d7c79650664c7a112ab175cb2329d2062f4d1e':
  ATT: Call does not establish to  '*1'
 2014-10-06 19:23:20 +00:00
Geoff Mendal
f132e7ef0e am aa5c62f3: (-s ours) am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'aa5c62f35999c2dc165771740e96c30b1b932aeb':
  Import translations. DO NOT MERGE
 2014-10-06 19:23:03 +00:00
Christopher Tate
3dd06aba80 am 39006668: am bbebe423: Merge "adb backup/restore fixes" into lmp-dev 
* commit '39006668235f9cdeac853911426b1543d3b092d0':
  adb backup/restore fixes
 2014-10-06 19:22:59 +00:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:22:53 +00:00
Geoff Mendal
4795dfba7f am 3647aba8: (-s ours) am ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3647aba82d30143e301d4bb251085f79308d872a':
  Import translations. DO NOT MERGE
 2014-10-06 19:22:48 +00:00
John Spurlock
b6f5cb3e45 am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '81b96aadbdc3726186c91b51465fb21ead56888a':
  Fix NPE in StrictMode handling.
 2014-10-06 19:22:44 +00:00
Andrew Solovay
da81acdffe am ed2237ae: am 2dd86d50: Merge "Removed preview license." into lmp-dev 
* commit 'ed2237aec8d348ee530f0c88c08392351690e5bb':
  Removed preview license.
 2014-10-06 19:22:40 +00:00
Geoff Mendal
ce2b1e8cfa Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-06 19:21:53 +00:00
Geoff Mendal
b041304094 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-06 19:18:38 +00:00
Geoff Mendal
aa5c62f359 am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '712363889899bfff564a39ef4d88ff048a9e5ec7':
  Import translations. DO NOT MERGE
 2014-10-06 19:17:23 +00:00
Christopher Tate
3900666823 am bbebe423: Merge "adb backup/restore fixes" into lmp-dev 
* commit 'bbebe42309a7012e0474b916f5209027889e8d57':
  adb backup/restore fixes
 2014-10-06 19:17:17 +00:00
Dianne Hackborn
90d557b7a6 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:17:10 +00:00
Amit Mahajan
17d7c79650 Merge "ATT: Call does not establish to '*1'" into lmp-dev 2014-10-06 19:17:06 +00:00
Geoff Mendal
3647aba82d am ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ec763118370e1fa79acb96b82a7ad37b6f2cc02e':
  Import translations. DO NOT MERGE
 2014-10-06 19:17:04 +00:00
John Spurlock
81b96aadbd am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '78cc93ec80f5dcc487db697a1f9a545890745847':
  Fix NPE in StrictMode handling.
 2014-10-06 19:16:53 +00:00
Andrew Solovay
ed2237aec8 am 2dd86d50: Merge "Removed preview license." into lmp-dev 
* commit '2dd86d50ae19efa071d83e02545b2767c351fdd6':
  Removed preview license.
 2014-10-06 19:16:47 +00:00
Geoff Mendal
7123638898 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-06 19:10:25 +00:00
Christopher Tate
bbebe42309 Merge "adb backup/restore fixes" into lmp-dev 2014-10-06 19:09:13 +00:00
Geoff Mendal
2c54b25580 Import translations. DO NOT MERGE 
Change-Id: I97d45a200138bb1a232327dacf2f933b69efc6ec
Auto-generated-cl: translation import
 2014-10-06 12:08:45 -07:00
Bing Gao
1c9bc00870 ATT: Call does not establish to '*1' 
Bug: 17809849
Change-Id: I43566c9f3b7a72b06a4b5f2a0a312ac42410269d
 2014-10-06 19:00:44 +00:00
Benson Huang
1e62e476fa am ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app 
* commit 'ce4483cb83afb3a42a32ef2cb00cf04d6f9018fd':
  [FM] Add FM_TUNER audio source to support L version FM radio app
 2014-10-06 18:54:19 +00:00
Benson Huang
ce4483cb83 [FM] Add FM_TUNER audio source to support L version FM radio app 
1.MediaRecorder.java: Add FM_TUNER audio source type for FM record.
    2.AudioRecord.java: For FM output to the other device,
     (except the headset case), record the FM tuner signal to a track
      and playback the recorded signal by a track.
    3.AudioAttributes.java: Thus we use AudioRecord, need to modify
      setCapturePreset to support MediaRecorder.AudioSource.FM_TUNER.

    Review: https://partner-android-review.git.corp.google.com/#/c/182071

    Signed-off-by: Benson Huang <benson.huang@mediatek.com>

Change-Id: If068d0bbbffb4848887004396a8a8d9bcba1334e
 2014-10-06 18:50:12 +00:00
Dianne Hackborn
7f7d240b13 Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 2014-10-06 18:48:34 +00:00
Geoff Mendal
419c63bf0e Import translations. DO NOT MERGE 
Change-Id: Ia892f6f28e8ad353ae460f3e167bb68d2246ac13
Auto-generated-cl: translation import
 2014-10-06 11:46:22 -07:00
Geoff Mendal
1c837af01d am 937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '937d6a6476be3ce06f3c9c10836a4399b7514231':
  Import translations. DO NOT MERGE
 2014-10-06 18:38:41 +00:00
Geoff Mendal
74a72f723a Import translations. DO NOT MERGE 
Change-Id: Iccf9bb82d63d8e5033f916ad5c89cff245ef2087
Auto-generated-cl: translation import
 2014-10-06 11:34:20 -07:00
Geoff Mendal
937d6a6476 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-06 18:33:46 +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
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
00092db1af Fix build breakage in API check 
Change-Id: I0fe7849b8b834fb32b13e60657685f72d1110d21
 2014-10-06 10:11:43 -07: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
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
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
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