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
Amit Mahajan
40f43c7aea am 384ff9ef: am 15c581fa: am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev 
* commit '384ff9ef5d2dc1278f63eb7e0f42ad03a9163dec':
  ATT: Call does not establish to  '*1'
 2014-10-06 19:36:44 +00:00
Geoff Mendal
1c8487c80e am aece3ec5: (-s ours) am ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'aece3ec51115abc11ec580f2823f6ec0ef62e7d6':
  Import translations. DO NOT MERGE
 2014-10-06 19:36:41 +00:00
Geoff Mendal
62c39bbe2e am f132e7ef: (-s ours) am aa5c62f3: (-s ours) am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f132e7ef0ece5a31595153ec71ef539b4c40f706':
  Import translations. DO NOT MERGE
 2014-10-06 19:32:05 +00:00
Christopher Tate
dd8541d781 am 3dd06aba: am 39006668: am bbebe423: Merge "adb backup/restore fixes" into lmp-dev 
* commit '3dd06aba8074fd3de68659f97d0136e05fc44c81':
  adb backup/restore fixes
 2014-10-06 19:32:01 +00:00
Dianne Hackborn
db75703b26 am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '2f577e83cbd5b12e47178a90443390210b446102':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:31:57 +00:00
Geoff Mendal
45a2eb9452 am 4795dfba: (-s ours) am 3647aba8: (-s ours) am ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4795dfba7fb5f7c03e1f85ec2464258f4987d364':
  Import translations. DO NOT MERGE
 2014-10-06 19:31:52 +00:00
John Spurlock
42730c9346 am b6f5cb3e: am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit 'b6f5cb3e45c9d4cf891d0ee024e7073f6d139677':
  Fix NPE in StrictMode handling.
 2014-10-06 19:31:49 +00:00
Andrew Solovay
5ae2730bce am da81acdf: am ed2237ae: am 2dd86d50: Merge "Removed preview license." into lmp-dev 
* commit 'da81acdffe587e997507cea39b47bf32018cf7ae':
  Removed preview license.
 2014-10-06 19:31:44 +00:00
Amit Mahajan
384ff9ef5d am 15c581fa: am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev 
* commit '15c581fa4c0dcff09d2fd65d6978f286b8b23b94':
  ATT: Call does not establish to  '*1'
 2014-10-06 19:28:53 +00:00
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
Geoff Mendal
5d6132be35 am 4c3ac5a2: (-s ours) am b0413040: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '4c3ac5a2a5a8ba22ae9f8263fc4db11cf8fa3c19':
  Import translations. DO NOT MERGE
 2014-10-06 19:26:16 +00:00
Geoff Mendal
d60fed600a am c1609420: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c160942009747135472509b00c3a97b4462cec0f':
  Import translations. DO NOT MERGE
 2014-10-06 19:26:12 +00: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
4c3ac5a2a5 am b0413040: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'b04130409494065d36e4bf4a602716de8836e0f5':
  Import translations. DO NOT MERGE
 2014-10-06 19:21:34 +00:00
Geoff Mendal
c160942009 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-06 19:21:04 +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
Benson Huang
6ad95c301c am 37fa980c: am 1e62e476: am ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app 
* commit '37fa980c55c1b5fab84110eb0355cffbae74a692':
  [FM] Add FM_TUNER audio source to support L version FM radio app
 2014-10-06 19:03:38 +00: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
37fa980c55 am 1e62e476: am ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app 
* commit '1e62e476fa6600dbf8dd82a428efb424a9938177':
  [FM] Add FM_TUNER audio source to support L version FM radio app
 2014-10-06 18:58:35 +00:00
Geoff Mendal
ff42b14395 Import translations. DO NOT MERGE 
Change-Id: Icce86f4ac15c45a9592f2c6f4cf2f8232cb0605e
Auto-generated-cl: translation import
 2014-10-06 11:57:11 -07: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
Geoff Mendal
cf8048f562 am 5a35aba8: (-s ours) am 1c837af0: (-s ours) am 937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5a35aba8a7609ca601f882e9fe09d88b74e3236f':
  Import translations. DO NOT MERGE
 2014-10-06 18:53:29 +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
Geoff Mendal
5a35aba8a7 am 1c837af0: (-s ours) am 937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '1c837af01db817dea4d37ad62c5587b04352ba54':
  Import translations. DO NOT MERGE
 2014-10-06 18:49:17 +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
21a30fc0b2 am 1ceb0f2e: (-s ours) am 88bc51ff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '1ceb0f2ea4e7bb11127e8360ca7e74c862500e18':
  Import translations. DO NOT MERGE
 2014-10-06 18:46:29 +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
7433171777 am f9c11d90: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'f9c11d904f46bb325627ff049fd4e8295c236475':
  Import translations. DO NOT MERGE
 2014-10-06 18:37:01 +00:00
Geoff Mendal
1ceb0f2ea4 am 88bc51ff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '88bc51ffcab7c636b5d0b2f8f309b20c6321e89b':
  Import translations. DO NOT MERGE
 2014-10-06 18:36:44 +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