Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,218 Commits 3 Branches 0 Tags
4e0bfd70d090b5653dd00c5a671db0519086dcfe
Commit Graph

3700 Commits

Author SHA1 Message Date
Hung-ying Tyan
3e5246b2eb am 8a33e964: am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 
Merge commit '8a33e964c48d22469487c8ec1d951826b7e3e562'

* commit '8a33e964c48d22469487c8ec1d951826b7e3e562':
  SIP: add PEER_NOT_REACHABLE error feedback.
 2010-09-15 16:47:30 -07:00
Hung-ying Tyan
bb5fb60c7c am 8d9e8de2: am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread 
Merge commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9'

* commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9':
  SipService: send SERVER_ERROR if server doesn't provide nonce
 2010-09-15 16:47:22 -07:00
Kenny Root
6545fcfd96 am 79a1ee42: am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread 
Merge commit '79a1ee4249aadc84558dad2e275b8edde198da76'

* commit '79a1ee4249aadc84558dad2e275b8edde198da76':
  Free AssetManager weak refs before unmounting
 2010-09-15 16:32:45 -07:00
Steve Howard
e28d80a80a am d2de99e3: am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread 
Merge commit 'd2de99e377408dc28dca5e4c61a816879595fbf3'

* commit 'd2de99e377408dc28dca5e4c61a816879595fbf3':
  Fix name shadowing bug with revoking URI permissions.
 2010-09-15 16:32:30 -07:00
Amith Yamasani
6734b9f680 Provide automatic date/time based on NTP lookup. 
Do this on a periodic basis as well as when the AUTO_TIME setting changes to true.

If we recently acquired NITZ time from the telephony provider, then don't override
with NTP time.
 2010-09-15 13:14:18 -07:00
Jeff Brown
49478536b6 am 14bc6b5d: am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 
Merge commit '14bc6b5d0677e5c454a67775c852f90389bb4567'

* commit '14bc6b5d0677e5c454a67775c852f90389bb4567':
  Replace epoll() with poll() and rename PollLoop to Looper.
 2010-09-15 12:32:29 -07:00
Mathias Agopian
a5ab8ce602 resolved conflicts for merge of 48a86240 to master 
Change-Id: I2305fef9f4dd46183337217d822df3c675b6b6e5
 2010-09-15 12:29:18 -07:00
Dianne Hackborn
eba36ff80d am 227afd3a: am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread 
Merge commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426'

* commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426':
  Fix problem where power manager was calling battery stats with bad wl type.
 2010-09-15 11:38:47 -07:00
Brad Fitzpatrick
b835d9abd6 am f26ac1f8: am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread 
Merge commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c'

* commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c':
  Unify some duplicate StrictMode-enabling code.
 2010-09-15 11:37:54 -07:00
Brad Fitzpatrick
562ec84987 am 79cc46d1: am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread 
Merge commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672'

* commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672':
  Add missing wallpaper service lock.
 2010-09-15 11:37:46 -07:00
Hung-ying Tyan
8a33e964c4 am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 
Merge commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482' into gingerbread-plus-aosp

* commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482':
  SIP: add PEER_NOT_REACHABLE error feedback.
 2010-09-15 07:42:48 -07:00
Hung-ying Tyan
8d9e8de2c9 am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread 
Merge commit '096df8197b9133703d2ed0abb69813db0c8b4129' into gingerbread-plus-aosp

* commit '096df8197b9133703d2ed0abb69813db0c8b4129':
  SipService: send SERVER_ERROR if server doesn't provide nonce
 2010-09-15 07:42:38 -07:00
Hung-ying Tyan
fbfb6f2f04 am 188a8f1b: am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread 
Merge commit '188a8f1b72452bc294daa2186e93771543be0478'

* commit '188a8f1b72452bc294daa2186e93771543be0478':
  SipService: ignore connect event for non-active networks.
 2010-09-15 07:08:38 -07:00
Kenny Root
685da21c1c am 3ca26914: am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread 
Merge commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc'

* commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc':
  Dedupe timestamp in PackageSettings
 2010-09-15 07:08:15 -07:00
Hung-ying Tyan
fcc7fb8a1a am 3692af92: am 99bf4e45: SIP: remove dependency on javax.sip 
Merge commit '3692af92ab290a561a927079cbf1f778f57fe5f9'

* commit '3692af92ab290a561a927079cbf1f778f57fe5f9':
  SIP: remove dependency on javax.sip
 2010-09-15 07:07:56 -07:00
Chung-yih Wang
4586063969 am 316e72cb: am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread 
Merge commit '316e72cb05637735c67ae02911dd0dbe096c71f5'

* commit '316e72cb05637735c67ae02911dd0dbe096c71f5':
  Fix the bug of authentication in an outgoing call.
 2010-09-15 07:07:47 -07:00
Hung-ying Tyan
074663c762 am ca83c25d: am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread 
Merge commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a'

* commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a':
  SipService: deliver connectivity change to all sessions.
 2010-09-15 07:07:19 -07:00
Hung-ying Tyan
5306e0a85d Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 2010-09-14 23:10:03 -07:00
Hung-ying Tyan
096df8197b Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread 2010-09-14 23:09:26 -07:00
Hung-ying Tyan
ae076d3981 SIP: add PEER_NOT_REACHABLE error feedback. 
http://b/issue?id=3002033

Change-Id: Ib64b08919d214acbab89945ac19dc113a68e62ad
 2010-09-15 11:30:45 +08:00
Kenny Root
79a1ee4249 am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread 
Merge commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6' into gingerbread-plus-aosp

* commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6':
  Free AssetManager weak refs before unmounting
 2010-09-14 18:04:53 -07:00
Kenny Root
cee0b97eed Merge "Free AssetManager weak refs before unmounting" into gingerbread 2010-09-14 18:02:39 -07:00
Steve Howard
d2de99e377 am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread 
Merge commit '536ee090ef75add0f7244c1c22be83fe03a66010' into gingerbread-plus-aosp

* commit '536ee090ef75add0f7244c1c22be83fe03a66010':
  Fix name shadowing bug with revoking URI permissions.
 2010-09-14 17:48:30 -07:00
Nipun Kwatra
4922c79582 Merge "Added command type to play recording sound." 2010-09-14 17:48:02 -07:00
Steve Howard
536ee090ef Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread 2010-09-14 17:46:22 -07:00
Nipun Kwatra
4e94c30ed5 Added command type to play recording sound. 
Added CAMERA_CMD_PLAY_RECORDING_SOUND command type to play recording
sound through sendCommand. This is currently needed by time lapse
recording using still mode capture, which disables the shutter sound
but needs to play the recording sound.

Change-Id: I376aa40f45b6064fd862abc065456b06fc338020
 2010-09-14 16:49:08 -07:00
Steve Howard
0de8ddb0cf Fix name shadowing bug with revoking URI permissions. 
Change-Id: Ibfcb0dc73c6b1a111dbb8d56e6f0b78084f5e4e6
 2010-09-14 16:29:26 -07:00
Jeff Brown
14bc6b5d06 am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp

* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
  Replace epoll() with poll() and rename PollLoop to Looper.
 2010-09-14 15:32:03 -07:00
Jaikumar Ganesh
4c9a5be4a3 Merge "Rework Bluetooth tethering networking configuration." 2010-09-14 15:27:47 -07:00
Jeff Brown
09340a4bb9 Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 2010-09-14 15:27:33 -07:00
Jaikumar Ganesh
707952ecd4 Rework Bluetooth tethering networking configuration. 
Limit it to 5 for now, and store the iface.

Change-Id: Ia6044b8e8f886dcd587ab0bb57273e0c11b6cd74
 2010-09-14 15:25:14 -07:00
Nipun Kwatra
22c0a58e76 Merge "Adding enable/disable option for sendCommand()" 2010-09-14 15:15:16 -07:00
Mathias Agopian
48a862407d am b3ffc78f: Merge "Add logging of various important graphics events" into gingerbread 
Merge commit 'b3ffc78f3432344702e6f5232067ab624083cad2' into gingerbread-plus-aosp

* commit 'b3ffc78f3432344702e6f5232067ab624083cad2':
  Add logging of various important graphics events
 2010-09-14 15:14:10 -07:00
Mathias Agopian
b3ffc78f34 Merge "Add logging of various important graphics events" into gingerbread 2010-09-14 15:11:33 -07:00
Kenny Root
aa48540222 Free AssetManager weak refs before unmounting 
AssetManagers are kept in WeakReference pools so there's a change
another thread in the system_server has opened a file on the external
card. Attempt to force a garbage collection to free these references
each time we're about to unmount a volume on the external storage.

Change-Id: I6e816e8c67b179887e488dc6758b43bcdd5914fb
 2010-09-14 14:49:41 -07:00
Nipun Kwatra
088146a421 Adding enable/disable option for sendCommand() 
- Added enum CAMERA_CMD_ENABLE_SHUTTER_SOUND which corresponds to
  command type for enabling/disabling shutter sound.
- The implementation checks if it is legal to disable shutter sound.
  If it is, then any process can disable the sound. If not, then only
  the mediaserver process is allowed to do this. Currently time lapse
  capture needs this functionality to disable shutter sound when still
  mode is used to capture time lapse video.

Change-Id: Id147a3bcc6a345c2c6a6d52bf98fd8292386bb19
 2010-09-14 13:57:59 -07:00
Dianne Hackborn
227afd3a1b am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread 
Merge commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b' into gingerbread-plus-aosp

* commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b':
  Fix problem where power manager was calling battery stats with bad wl type.
 2010-09-14 12:31:07 -07:00
Dianne Hackborn
1188f5e76c Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread 2010-09-14 12:28:08 -07:00
Hung-ying Tyan
88203cb111 SipService: send SERVER_ERROR if server doesn't provide nonce 
in authentication response.

Change-Id: I93e8c0d6754399ca2f382033085e40fc4c6ccb19
 2010-09-15 03:00:19 +08:00
Brad Fitzpatrick
f26ac1f8ed am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread 
Merge commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf' into gingerbread-plus-aosp

* commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf':
  Unify some duplicate StrictMode-enabling code.
 2010-09-14 11:39:54 -07:00
Brad Fitzpatrick
79cc46d1b0 am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread 
Merge commit 'fb85bc66c467be96fe8420338321df6f15359d7d' into gingerbread-plus-aosp

* commit 'fb85bc66c467be96fe8420338321df6f15359d7d':
  Add missing wallpaper service lock.
 2010-09-14 11:39:43 -07:00
Brad Fitzpatrick
96d6c3454c Merge "Unify some duplicate StrictMode-enabling code." into gingerbread 2010-09-14 11:37:13 -07:00
Brad Fitzpatrick
fb85bc66c4 Merge "Add missing wallpaper service lock." into gingerbread 2010-09-14 11:37:05 -07:00
Brad Fitzpatrick
194b19a4b3 Add missing wallpaper service lock. 
Unimportant, but found while reading the code for other reasons.

Change-Id: I9f2fad3ff5d081aef7a35e5f33ec5de7dc92195e
 2010-09-14 11:30:29 -07:00
Dianne Hackborn
70be1673ab Fix problem where power manager was calling battery stats with bad wl type. 
Also fiddle code to reduce duplication.

Change-Id: I3f1b086e53ef88dac1ec1896fe711b3cfe7fdd58
 2010-09-14 11:13:03 -07:00
Hung-ying Tyan
188a8f1b72 am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread 
Merge commit '89a7180a242043a0b4d6695bf386c93365bf6797' into gingerbread-plus-aosp

* commit '89a7180a242043a0b4d6695bf386c93365bf6797':
  SipService: ignore connect event for non-active networks.
 2010-09-14 10:00:14 -07:00
Hung-ying Tyan
89a7180a24 Merge "SipService: ignore connect event for non-active networks." into gingerbread 2010-09-14 09:57:47 -07:00
Hung-ying Tyan
12bec5ddf5 SipService: ignore connect event for non-active networks. 
+ sanity check and remove redundant code.

Change-Id: I4d3e226851ad7fc4d88ddcd0a5c58f7e33b6c14a
 2010-09-15 00:49:02 +08:00
Kenny Root
3ca2691446 am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread 
Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp

* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
  Dedupe timestamp in PackageSettings
 2010-09-14 09:46:40 -07:00
Hung-ying Tyan
3692af92ab am 99bf4e45: SIP: remove dependency on javax.sip 
Merge commit '99bf4e45c4566172189735b34b368b76660ca57a' into gingerbread-plus-aosp

* commit '99bf4e45c4566172189735b34b368b76660ca57a':
  SIP: remove dependency on javax.sip
 2010-09-14 09:43:54 -07:00