Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,353 Commits 3 Branches 0 Tags
7dc08fb070ff7455e794fc81645ccb4349cd152f
Commit Graph

26353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Huang
7dc08fb070 Merge "Fix connect duration for un-established SIP calls." into gingerbread 2010-10-21 10:46:17 -07:00
Sylvain Fonteneau
a71354d766 Enable presence check at application level using 
RawTagConnection.isConnected() method.

Also needs packages/apps/Nfc to be updated.

Change-Id: I726e88853e2c4b348f3b87b7574bc6eded7f5b7c
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-21 03:54:52 -07:00
Nick Pelly
7ea5c45e8d NFC settings cleanup. 
Remove NFC settings from Settings.System. The NFC Service tracks them
internally using SharedPreference.

Revert back to enable()/disable()/isEnabled() - Tag discovery is the
only functionality NFC service performs right now so we don't need to
break it up more explicitly yet. enable/disable is the global NFC
on/off and later we'll add enableDiscovery(), enableTagEmulation(),
enableSecureElement() etc as needed.

Change-Id: Id5b23e89d4a29511835f509962842452075e56cb
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-21 03:54:51 -07:00
Hung-ying Tyan
5d9e3bbb9d Fix connect duration for un-established SIP calls. 
Bug: 3118364
Change-Id: I931b675de04a3aac70b45d6bae27ab42a84f2d1e
 2010-10-21 15:54:46 +08:00
James Dong
fa7a87fb4b Merge "File writer size estimation improvement" into gingerbread 2010-10-20 20:07:57 -07:00
Mathias Agopian
2b2da52608 Merge "Add a test application to dump all the EGLConfig available" into gingerbread 2010-10-20 20:05:28 -07:00
Mathias Agopian
73655bd2d3 Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread 2010-10-20 20:04:52 -07:00
Mathias Agopian
583fefc8dc Merge "Use the context_priority extension when present." into gingerbread 2010-10-20 20:04:46 -07:00
Mathias Agopian
a0795fc9bd Merge "software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID" into gingerbread 2010-10-20 18:00:43 -07:00
Mathias Agopian
c9923876d4 software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID 
Change-Id: I371bc0abfee6065247bc6f04b0e0451645eb2dbf
 2010-10-20 17:21:43 -07:00
Dianne Hackborn
fb2cd0aa9d Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 2010-10-20 17:12:27 -07:00
Mathias Agopian
cd1e02d460 Add a test application to dump all the EGLConfig available 
Change-Id: Iddf27f2a9dd51733f6b90081a523ca37bfe310fa
 2010-10-20 17:10:47 -07:00
Dianne Hackborn
eddfc04a08 Fix java doc on FLAG_EXTERNAL. 
Change-Id: Ic533b3a6c3300a986dd8d0da04243d723cf393ef
 2010-10-20 16:03:37 -07:00
Kenny Root
ddf8fe5056 Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread 2010-10-20 14:10:00 -07:00
Dianne Hackborn
e9e2340583 Merge "Fix issue #3113424: Battery stats don't reset on Crespo" into gingerbread 2010-10-20 14:08:26 -07:00
Justin Ho
d5aaff548d Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 2010-10-20 13:35:40 -07:00
Hung-ying Tyan
4056ab97be Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 2010-10-20 13:28:02 -07:00
Hung-ying Tyan
6037a056ea Fix n-way conf call in SipPhone. 
+ Avoid concurrent modification when forming >3-way conf call.
+ Revise SipConnection.separate() to put the newly separated call to foreground.

Bug: 3114987

Change-Id: If6204e7e3cc05f4a516c33657a368b53a0ad014d
 2010-10-21 03:59:04 +08:00
Justin Ho
6312822111 DO NOT MERGE - Updated media playback transport controls (b/3116268) 
Change-Id: Ic496308d4f72e9135e35a1b29bc20feb990c3507
 2010-10-20 12:44:46 -07:00
Hung-ying Tyan
e87b644402 Add permission requirements to SipAudioCall and SipManager javadoc. 
Bug: 3116259

Change-Id: I00a033794e9d3e1c2d2ccfe4e612cd50003ec2ee
 2010-10-21 03:27:20 +08:00
Dianne Hackborn
266e607bde Fix issue #3113424: Battery stats don't reset on Crespo 
Change-Id: I38cc3cdfa9cb1466fe3659f001ee57aecf9df179
 2010-10-20 12:26:48 -07:00
Jeff Hamilton
23392a84bc Fix the build. 
Change-Id: Id5bfa0f91e6ec687201a320a1eb4d8a46050875e
 2010-10-20 14:20:29 -05:00
Hung-ying Tyan
6fe795ecd3 Do another contact lookup if the first one fails and... 
it's a SIP call and the peer's username is all numeric. The all-numeric username
could be a PSTN number.

Bug: 3105116 (case #2)

Change-Id: I1de9cfac3aab1c4c89935176264d07693adb5e7d
 2010-10-21 02:54:57 +08:00
Hung-ying Tyan
baced375ba Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread 2010-10-20 11:49:26 -07:00
Hung-ying Tyan
88e3f0ad28 Silently reject a ringing call when another call is dialing/ringing. 
http://b/issue?id=3109483
http://b/issue?id=3103072

Change-Id: I34f13225319c7f2a41e1ea9e25811866432ab809
 2010-10-21 02:38:04 +08:00
Dianne Hackborn
74b1ed3231 Fix issue #3113219: NativeActivity using wrong lib path with Java code 
Use the same path whether the .apk has dalvik code or not.

Change-Id: I66397d7f7e328d5580565ceb17a941afac0e0f8b
 2010-10-20 10:22:45 -07:00
Tony Wu
b09773dee0 Fix isUsbMassStorageConnected() will always return true 
After UMS mounted, isUsbMassStorageConnected() will always return true even if USB is disconnected.
It's because mUmsEnabling will always be ture.

Change-Id: Ib24b2359ea2684eb0a9faeb880f383e87630e6e1
 2010-10-20 10:17:28 -07:00
Hung-ying Tyan
1180f2a099 Merge "Remove ringtone API from SipAudioCall." into gingerbread 2010-10-20 09:47:45 -07:00
Dirk Dougherty
3466e1fc6d Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 2010-10-20 09:34:24 -07:00
Hung-ying Tyan
9b449e5606 Remove ringtone API from SipAudioCall. 
(watch out auto-merge conflict for SipAudioCall).

Bug: 3113033, related CL: https://android-git/g/#change,75185

Change-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f
 2010-10-20 22:51:22 +08:00
Hung-ying Tyan
b595e094e3 Merge "Return display name in SipConnection.getCnapName()." into gingerbread 2010-10-19 23:00:16 -07:00
James Dong
22b37fa6e0 File writer size estimation improvement 
o Do not count the reserved space for moov if the meta data size is small
o Do not count the extra 1KB disturbing small file estimation.
o Reduce the default minimum reserved space from 4 KB to 3 KB.
o Estimate the moov size based on both duration AND file size limit is set
  and set it to the smaller estimated value.

low risk change

bug - 3111983

Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
 2010-10-19 22:59:22 -07:00
Hung-ying Tyan
538e58fc75 Return display name in SipConnection.getCnapName(). 
Bug: 3105116 (case #1)

Change-Id: Iedf3c8de07213c786cffb861bd52c3b4a768a86c
 2010-10-20 11:21:55 +08:00
Mathias Agopian
f4cd9be039 Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread 2010-10-19 18:23:19 -07:00
Mindy Pereira
6fbc5d9c19 DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Fixes b/3111778 overscroll glitch in news & weather

Change-Id: Ic255da1f7c4301ea3980acc4fa033c9f17a60dac
 2010-10-19 17:38:24 -07:00
Scott Main
218bf88446 am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image 
Merge commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722' into gingerbread

* commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722':
  docs: add note to froyo platform doc that not all locales are included in the sdk image
 2010-10-19 17:29:29 -07:00
Scott Main
a6df4b1bfd docs: add note to froyo platform doc that not all locales are included in the sdk image 
Change-Id: Icf11a14e0db6eeff535ca51de7a664a4829a35ec
 2010-10-19 16:40:14 -07:00
Mathias Agopian
f91bff9fd4 fix [2236865] STOPSHIP: bump soft gl and egl minor version number 
Change-Id: Ibf46b18d7493348e189f2c93e969a6cac61f68b5
 2010-10-19 14:47:08 -07:00
Chung-yih Wang
4944fdd771 Periodically scan wifi when wifi is not connected and wifi lock is 
grabbed in SipService.

bug: http://b/3077454
Change-Id: I153974325c29e0f927c8eb7fdbc4725aaf10087d
 2010-10-19 14:09:30 -07:00
Hung-ying Tyan
0a6e717fb6 Handle dialing a SIP call to self. 
Reply BUSY HERE response so server may redirect the call to the voice mailbox.

http://b/issue?id=3103072
http://b/issue?id=3109479

Change-Id: I81f5dd59ad87298dd9dda87084538ee460eabba8
 2010-10-19 14:00:11 -07:00
Brad Fitzpatrick
59993d9bc5 Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 2010-10-19 12:40:53 -07:00
Joe Onorato
bdf1706ac6 Merge "Reduce logging." into gingerbread 2010-10-19 12:23:51 -07:00
Brad Fitzpatrick
44d2c69ad3 Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX 
Bug: 3110967
Change-Id: I156070956528c8c7d1eb6db5d2e8bb1fe119178d
 2010-10-19 12:19:41 -07:00
Brad Fitzpatrick
987e8d7f97 Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 2010-10-19 12:12:31 -07:00
Joe Onorato
431bb22695 Reduce logging. 
Remember, the system and main logs are
    - Shared resources
    - Primarily for recording problems
    - To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
 2010-10-19 15:08:05 -04:00
Chris Tate
1858031946 DO NOT MERGE. Turn down backup logging for release. 
Change-Id: Ib9f4fd15981fcf52b5d5912995c1891836303427
 2010-10-19 11:22:03 -07:00
Brad Fitzpatrick
26e9cf38b2 Fix Vibrator permission CTS test broken earlier. 
Bug: 3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
 2010-10-19 11:02:20 -07:00
Andreas Huber
52bea277ff Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread 2010-10-19 09:59:01 -07:00
Andreas Huber
4d450a8657 If we encounter video stream EOS while seeking we may still need to seek audio. 
Change-Id: Ie260942247b6810ca94e86328a3725d75b12181d
related-to-bug: 3108724
 2010-10-19 09:34:44 -07:00
Kenny Root
928b07480b Merge "Don't symlink native library paths for old apps" into gingerbread 2010-10-19 09:28:28 -07:00