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

79746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
98853623bc Merge "Telephony: Move AdnRecord.aidl into opt/telephony" 2012-08-04 07:54:35 -07:00
Wink Saville
e20a19cb54 Merge "show 3G icon for CDMA/1xRTT" 2012-08-04 07:51:27 -07:00
Alex Yakavenka
7b3b02cb53 Telephony: Move AdnRecord.aidl into opt/telephony 
Change-Id: Ib22f3e777f1cd39fb6da5b907bcec57c2c66ce3a
 2012-08-03 16:47:51 -07:00
Madan Ankapura
68cad3a0fa show 3G icon for CDMA/1xRTT 
when config_showMin3G is enabled to true in a CDMA device

Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
 2012-08-02 19:10:22 -07:00
Brian Carlstrom
d2237dfe7d Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" 2012-08-01 16:30:54 -07:00
Brian Carlstrom
2a5b147ec8 Change KeyStore to use Modified UTF-8 to match NativeCrypto 
Bug: http://code.google.com/p/android/issues/detail?id=35141
Bug: 6869713

Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
 2012-08-01 15:44:52 -07:00
Brian Carlstrom
4faeef378e Merge "Improve test key names to reproduce public issue" 2012-08-01 15:06:35 -07:00
Robert Greenwalt
a5637bac23 Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName" 2012-08-01 11:01:21 -07:00
Adam Powell
2ffb1acbb7 Merge " Fix preload classname for phone policy." 2012-07-30 10:46:12 -07:00
Brian Carlstrom
5ea68db37f Improve test key names to reproduce public issue 
Also fixes other unrelated test failures.

Bug: http://code.google.com/p/android/issues/detail?id=34577
Bug: 6837950

(cherry-picked from f4019af04a1fc4b16aa5972cbcbba703caa5d78d)

Change-Id: I5b32b5ccac80f04a4d0fd6b21b8caa11e42995a7
 2012-07-27 22:41:42 -07:00
Romain Guy
dfac68eacc Merge "Corrected typo when checking InputStream methods" 2012-07-27 13:58:12 -07:00
Edward Savage-Jones
8ac41bb79e Corrected typo when checking InputStream methods 
Corrected a small typo where Java InputStream methods are
incorrectly checked when creating a JNI InputStream adaptor.

Change-Id: I5f14897e0d5ddceb4b2af6be46769713f0487624
 2012-07-27 15:14:24 +02:00
Naveen Kalla
897b311ccb Telephony: Add HSPAP to getTcpBufferSizesPropName 
When device is camped on HSPAP TCP Buffer sizes need to be configured
properly to support higher data rates. Without this change, default TCP
buffer sizes will be used and throughput will be low.

Change-Id: Ica5884b35851a32e57c82c63b148df5be580ae83
 2012-07-26 00:07:20 -07:00
Nick Kralevich
2c932143ff Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks" 2012-07-19 16:25:42 -07:00
Jake Hamby
06d3df9aa0 Merge "Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony" 2012-07-19 15:30:02 -07:00
Naveen Kalla
93cb0dd3b2 Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony 
This test was missed out while migrating telephony to frameworks/opt.

Change-Id: I75d5bfef81352ebb916b3a4b3e482550478b797b
 2012-07-18 14:51:11 -07:00
Wink Saville
33034b13ca Create telephony-common and mms-common - DO NOT MERGE 
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
 2012-07-17 12:23:09 -07:00
Elliott Hughes
3c04cc44c4 Merge "Don't talk about Froyo as if it's still in the future." 2012-07-16 15:40:25 -07:00
Elliott Hughes
79d95ac74e Don't talk about Froyo as if it's still in the future. 
Change-Id: I40c26a7a27459f7e8dd51c9f03fa860dee3a3a02
 2012-07-16 15:30:53 -07:00
Romain Guy
8d1704215e Merge "Fix wrong condition." 2012-07-16 00:57:42 -07:00
SeongJae Park
8108e9f8cd Fix wrong condition. 
Should check width and height, not width and width.

Change-Id: Ie84d3605b2a7a0f4776adb876608ea92f56817c4
 2012-07-14 14:18:51 +09:00
Joshua Brindle
365861e3aa s/LOG/ALOG/ in HAVE_SELINUX blocks 
The latest push changed LOG(E|V) to ALOG(E|V) but it was not updated in HAVE_SELINUX blocks.

Change-Id: I626588589dd00775ba29f2a256ac29e481598dc3
Signed-off-by: Joshua Brindle <jbrindle@tresys.com>
 2012-07-10 11:02:01 -04:00
Romain Guy
13a3a87fa7 am dc99555d: Merge "Pass SearchView suggestion cursor exception to Log." 
* commit 'dc99555d61d50820b398096bb774ee56b2500476':
  Pass SearchView suggestion cursor exception to Log.
 2012-07-06 23:52:55 -07:00
Romain Guy
dc99555d61 Merge "Pass SearchView suggestion cursor exception to Log." 2012-07-06 23:18:19 -07:00
Jake Wharton
73af451694 Pass SearchView suggestion cursor exception to Log. 
When an error in fetching a column occurs in your suggestions cursor
adapter this will ensure the stacktrace is logged to provide more
context about what failed.

Change-Id: Iafe4918caebb9b0fb712b758b2d3ace329fd2512
 2012-07-06 23:15:49 -07:00
Scott Main
d5f7d9b59d am 15796e52: Merge "docs: add largeHeap attribute to app manifest doc external issue 33967" into jb-dev 
* commit '15796e52df1626ae27a6a88c6e905fd3b80868c9':
  docs: add largeHeap attribute to app manifest doc external issue 33967
 2012-07-03 19:41:56 -07:00
Scott Main
15796e52df Merge "docs: add largeHeap attribute to app manifest doc external issue 33967" into jb-dev 2012-07-03 19:39:26 -07:00
Scott Main
31f38d692c am e469e74f: docs: new sitemap text file 
* commit 'e469e74fd339efcfe88b56780f4380b0d1dd2ce8':
  docs: new sitemap text file
 2012-07-03 19:32:42 -07:00
Scott Main
e469e74fd3 docs: new sitemap text file 
Change-Id: Ia28407054216997126873bb855d55c9caeeb05b4
 2012-07-03 19:29:45 -07:00
Scott Main
01e1b832d7 docs: add largeHeap attribute to app manifest doc 
external issue 33967

Change-Id: I69e5d3da78098842c4710708f4d389637dd0fe6b
 2012-07-03 18:21:00 -07:00
Scott Main
480785dabb am fd516987: docs: misc bugs from external tracker 
* commit 'fd516987de29a48425da5ee5aace5be40adcc674':
  docs: misc bugs from external tracker
 2012-07-03 18:15:19 -07:00
Scott Main
fd516987de docs: misc bugs from external tracker 
Change-Id: I02d0d82c220401ac3a1ca180e8331a0f6dcd9e50
 2012-07-03 18:08:19 -07:00
Scott Main
7b5488d85d am 099fd80f: docs: add throws notice for isPlaying per external issue 33610 
* commit '099fd80f984b8493de58bdda8ea05563261b0af2':
  docs: add throws notice for isPlaying per external issue 33610
 2012-07-03 17:39:25 -07:00
Scott Main
099fd80f98 docs: add throws notice for isPlaying 
per external issue 33610

Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
 2012-07-03 17:32:23 -07:00
Joe Malin
33715d1434 am 4c633ea6: Merge "DOC CHANGE: AOSP33968 Typo" into jb-dev 
* commit '4c633ea6f28711d168f690f7443c9523451bdbab':
  DOC CHANGE: AOSP33968 Typo
 2012-07-03 15:15:59 -07:00
Joe Malin
4c633ea6f2 Merge "DOC CHANGE: AOSP33968 Typo" into jb-dev 2012-07-03 15:12:46 -07:00
Joe Malin
fd29e8a58f DOC CHANGE: AOSP33968 Typo 
Change-Id: I05de2666db6074c84caf540658aad96e6a4805d5
 2012-07-03 14:34:16 -07:00
Joe Malin
14f84873c5 am 8d5efa6a: Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-dev 
* commit '8d5efa6a8c68f53198b35d01ce64857ae1bf7946':
  DOC CHANGE: AOSP 33831 - Typo
 2012-07-03 14:27:28 -07:00
Joe Malin
8d5efa6a8c Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-dev 2012-07-03 14:24:26 -07:00
Scott Main
da4b6db999 am 8ab2dfb2: Merge "docs: fix urls on homepage for offline docs" into jb-dev 
* commit '8ab2dfb293133fa0033a1df9bcf7efb926b421d0':
  docs: fix urls on homepage for offline docs
 2012-07-03 14:12:27 -07:00
The Android Open Source Project
7e2f39043d Reconcile with jb-release 
Change-Id: I2bd087f75ee99d101e38d0e7b62d0aa701283107
 2012-07-03 14:09:24 -07:00
Scott Main
8ab2dfb293 Merge "docs: fix urls on homepage for offline docs" into jb-dev 2012-07-03 14:09:17 -07:00
Joe Malin
67970e8aa0 DOC CHANGE: AOSP 33831 - Typo 
Change-Id: I394fd5394baf9615463533157e06699478460ceb
 2012-07-03 13:54:29 -07:00
Scott Main
88eee9972e docs: fix urls on homepage for offline docs 
Change-Id: Ifa1da094ee6482c7324ec5a8b50d245d505390b9
 2012-07-03 13:19:45 -07:00
The Android Automerger
c292a619c7 merge in jb-release history after reset to jb-dev 2012-07-03 12:53:52 -07:00
Daniel Sandler
97270ce8ce am 5d0c689b: Merge "Logs to track bug 6765842." into jb-dev 
* commit '5d0c689b9b98be1b9be4d535ddb6f73142fd9b25':
  Logs to track bug 6765842.
 2012-07-03 12:12:35 -07:00
The Android Open Source Project
1a4f71b2d4 Reconcile with jb-release 
Change-Id: Ic8cef33354ceb00868f939950089574353e76ce3
 2012-07-03 12:11:48 -07:00
Daniel Sandler
5d0c689b9b Merge "Logs to track bug 6765842." into jb-dev 2012-07-03 12:10:19 -07:00
Scott Main
7034ed833f am 5a883824: Merge "docs: fix document issue 27549" into jb-dev 
* commit '5a883824a2e97e0ccb08b4fe30accde6542f3f39':
  docs: fix document issue 27549
 2012-07-03 11:54:11 -07:00
Scott Main
5a883824a2 Merge "docs: fix document issue 27549" into jb-dev 2012-07-03 11:51:30 -07:00