Commit Graph

8008 Commits

Author SHA1 Message Date
Mike Lockwood
55c67f4262 am 267e6214: am 445f4308: NotificationManagerService: Only blink red battery low LED when not charging.
Merge commit '267e621468516e4e5da82707f8a2d84ada164131'

* commit '267e621468516e4e5da82707f8a2d84ada164131':
  NotificationManagerService: Only blink red battery low LED when not charging.
2009-09-04 11:07:12 -07:00
Jean-Baptiste Queru
6179d2f928 am 3c193a4a: merge from open-source master
Merge commit '3c193a4a8d748faf420988250aabda0145e74bf7'

* commit '3c193a4a8d748faf420988250aabda0145e74bf7':
  Fix %p vs %s typo in aapt message
2009-09-04 11:06:31 -07:00
Eddie Ho
d7078c586b am 8e739ac6: am 71119048: Merge change 23949 into eclair
Merge commit '8e739ac69fbfc36a138800e7b0a2caf88b11a181'

* commit '8e739ac69fbfc36a138800e7b0a2caf88b11a181':
  GPS: Fix race condition reporting NMEA data.
2009-09-04 11:05:19 -07:00
Andrei Popescu
3672f246a8 am 13e3e0ab: am 34619494: Merge change 23804 into eclair
Merge commit '13e3e0ab9a40d6130e4dc1102bba920a1f5c3c2b'

* commit '13e3e0ab9a40d6130e4dc1102bba920a1f5c3c2b':
  Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
2009-09-04 11:05:10 -07:00
Jesse Wilson
29459b22a0 am 1cdacef0: (-s ours) am f163f7f0: do not merge: fix API current.xml for Hashtable.
Merge commit '1cdacef021bdea80fcb40c72dd8efa7fe718debe'

* commit '1cdacef021bdea80fcb40c72dd8efa7fe718debe':
  do not merge: fix API current.xml for Hashtable.
2009-09-04 11:04:54 -07:00
Jesse Wilson
6925ef384d am 6ffca353: (-s ours) am 6de753bf: do not merge: update API for Josh\'s optimizations for Eclair
Merge commit '6ffca3534c7b12bf503529bf50b53cfc6c728ff7'

* commit '6ffca3534c7b12bf503529bf50b53cfc6c728ff7':
  do not merge: update API for Josh's optimizations for Eclair
2009-09-04 11:04:49 -07:00
Dmitri Plotnikov
328b963fd9 am da32be5e: am 1ab3ebad: Merge change 23906 into eclair
Merge commit 'da32be5e06b9f02d0113b072de79276e16d19f50'

* commit 'da32be5e06b9f02d0113b072de79276e16d19f50':
  Removing references to deprecated API and the deprecated API itself.
2009-09-04 11:04:21 -07:00
Andreas Huber
7f3efff773 am 0e5e77ce: am a19cb68b: Merge change 23908 into eclair
Merge commit '0e5e77ce11b9d0f7d4ce0a2a9d92fce203793271'

* commit '0e5e77ce11b9d0f7d4ce0a2a9d92fce203793271':
  Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
2009-09-04 11:04:17 -07:00
Wink Saville
80bd403a3f am 82534558: am ccc41a26: Merge change 23870 into eclair
Merge commit '82534558bdf3e2c37391662195cfe9a144e38076'

* commit '82534558bdf3e2c37391662195cfe9a144e38076':
  Allow hasIccCard to be useable by any processes.
2009-09-04 11:03:59 -07:00
Jason Sams
312c89ad25 am 2d666c4c: am 4879d0d0: Merge change 23890 into eclair
Merge commit '2d666c4cbe488551a3c049b314c703371c73f468'

* commit '2d666c4cbe488551a3c049b314c703371c73f468':
  Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
2009-09-04 11:03:50 -07:00
Mike Lockwood
267e621468 am 445f4308: NotificationManagerService: Only blink red battery low LED when not charging.
Merge commit '445f43081e207ee704a5152a5333054d7b4e13a4' into eclair-plus-aosp

* commit '445f43081e207ee704a5152a5333054d7b4e13a4':
  NotificationManagerService: Only blink red battery low LED when not charging.
2009-09-04 10:05:48 -07:00
Mike Lockwood
445f43081e NotificationManagerService: Only blink red battery low LED when not charging.
Change-Id: Ie5836ae99d4ca19d9d062e7c78c8b40cd8d6c29d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-04 11:06:46 -04:00
Jean-Baptiste Queru
3c193a4a8d merge from open-source master 2009-09-04 07:54:30 -07:00
Eddie Ho
8e739ac69f am 71119048: Merge change 23949 into eclair
Merge commit '7111904802934e1fa4cf68c445f13c34c30c9cdb' into eclair-plus-aosp

* commit '7111904802934e1fa4cf68c445f13c34c30c9cdb':
  GPS: Fix race condition reporting NMEA data.
2009-09-04 04:50:59 -07:00
Android (Google) Code Review
7111904802 Merge change 23949 into eclair
* changes:
  GPS: Fix race condition reporting NMEA data.
2009-09-04 04:49:11 -07:00
Eddie Ho
eb40aae254 GPS: Fix race condition reporting NMEA data.
Change-Id: I80997e2686d9c08d7d2def094f9922e83cf41013
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-04 07:05:08 -04:00
Andrei Popescu
13e3e0ab9a am 34619494: Merge change 23804 into eclair
Merge commit '34619494e009d998f5c073145c0481e38bbd2bcf' into eclair-plus-aosp

* commit '34619494e009d998f5c073145c0481e38bbd2bcf':
  Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
2009-09-04 03:29:36 -07:00
Android (Google) Code Review
34619494e0 Merge change 23804 into eclair
* changes:
  Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
2009-09-04 03:27:47 -07:00
Jesse Wilson
1cdacef021 am f163f7f0: do not merge: fix API current.xml for Hashtable.
Merge commit 'f163f7f0f29f0898eb82f54cf657cb34668abade' into eclair-plus-aosp

* commit 'f163f7f0f29f0898eb82f54cf657cb34668abade':
  do not merge: fix API current.xml for Hashtable.
2009-09-03 18:23:40 -07:00
Jesse Wilson
f163f7f0f2 do not merge: fix API current.xml for Hashtable. 2009-09-03 18:20:50 -07:00
Jesse Wilson
6ffca3534c am 6de753bf: do not merge: update API for Josh\'s optimizations for Eclair
Merge commit '6de753bffe47e796942272692869992f62f8f0ab' into eclair-plus-aosp

* commit '6de753bffe47e796942272692869992f62f8f0ab':
  do not merge: update API for Josh's optimizations for Eclair
2009-09-03 17:50:58 -07:00
Jesse Wilson
6de753bffe do not merge: update API for Josh's optimizations for Eclair 2009-09-03 17:48:11 -07:00
Dmitri Plotnikov
da32be5e06 am 1ab3ebad: Merge change 23906 into eclair
Merge commit '1ab3ebad95e6b537719ee2f608c1fbc321e51f06' into eclair-plus-aosp

* commit '1ab3ebad95e6b537719ee2f608c1fbc321e51f06':
  Removing references to deprecated API and the deprecated API itself.
2009-09-03 16:31:26 -07:00
Android (Google) Code Review
1ab3ebad95 Merge change 23906 into eclair
* changes:
  Removing references to deprecated API and the deprecated API itself.
2009-09-03 16:29:44 -07:00
Dmitri Plotnikov
b1e2a4d0d0 Removing references to deprecated API and the deprecated API itself. 2009-09-03 16:27:37 -07:00
Andreas Huber
0e5e77ce11 am a19cb68b: Merge change 23908 into eclair
Merge commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8' into eclair-plus-aosp

* commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8':
  Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
2009-09-03 16:25:48 -07:00
Android (Google) Code Review
a19cb68b2d Merge change 23908 into eclair
* changes:
  Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
2009-09-03 16:24:46 -07:00
Andreas Huber
54ee7849ab Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app. 2009-09-03 16:09:33 -07:00
Wink Saville
82534558bd am ccc41a26: Merge change 23870 into eclair
Merge commit 'ccc41a26b8e1d702c1ccec1642758bde52e1b435' into eclair-plus-aosp

* commit 'ccc41a26b8e1d702c1ccec1642758bde52e1b435':
  Allow hasIccCard to be useable by any processes.
2009-09-03 15:56:10 -07:00
Android (Google) Code Review
ccc41a26b8 Merge change 23870 into eclair
* changes:
  Allow hasIccCard to be useable by any processes.
2009-09-03 15:54:22 -07:00
Jason Sams
2d666c4cbe am 4879d0d0: Merge change 23890 into eclair
Merge commit '4879d0d0a41c8f082facd6172221d0c36f21c6c2' into eclair-plus-aosp

* commit '4879d0d0a41c8f082facd6172221d0c36f21c6c2':
  Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
2009-09-03 15:50:02 -07:00
Android (Google) Code Review
4879d0d0a4 Merge change 23890 into eclair
* changes:
  Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs.
2009-09-03 15:47:39 -07:00
Jason Sams
2525a81522 Improve structure support using symbol lookup of named structures in scripts to allow them to appear as just pointers to structs. 2009-09-03 15:43:13 -07:00
Jean-Baptiste Queru
be8e36e32b merge from donut 2009-09-03 15:19:21 -07:00
Jaikumar Ganesh
c7e7180ea5 am a980fce6: am 7c599e02: Merge change 21774 into eclair
Merge commit 'a980fce64fba1df71e1e0d7ed60391bf9825a1bb'

* commit 'a980fce64fba1df71e1e0d7ed60391bf9825a1bb':
  Implement USIM and add support for importing emails from USIM.
2009-09-03 14:47:57 -07:00
Jaikumar Ganesh
a980fce64f am 7c599e02: Merge change 21774 into eclair
Merge commit '7c599e0288fb4ad9d393467458f59c45638d04ec' into eclair-plus-aosp

* commit '7c599e0288fb4ad9d393467458f59c45638d04ec':
  Implement USIM and add support for importing emails from USIM.
2009-09-03 14:46:03 -07:00
Android (Google) Code Review
7c599e0288 Merge change 21774 into eclair
* changes:
  Implement USIM and add support for importing emails from USIM.
2009-09-03 14:45:00 -07:00
Dianne Hackborn
56aae57075 am 6b085a3d: am ebf0bbaa: Merge change 23868 into eclair
Merge commit '6b085a3d821306a9b65cebdae19d75597b3c680e'

* commit '6b085a3d821306a9b65cebdae19d75597b3c680e':
  Add better service reporting.
2009-09-03 14:44:23 -07:00
Mike Lockwood
d1e6dfe4b3 am b7677205: am e131b746: Merge change 23861 into eclair
Merge commit 'b7677205fa5a8d85336959dc0188467b6e98e857'

* commit 'b7677205fa5a8d85336959dc0188467b6e98e857':
  Replace the bugreport symlink with a tool that starts the new dumpstate service.
2009-09-03 14:44:21 -07:00
Dianne Hackborn
6b085a3d82 am ebf0bbaa: Merge change 23868 into eclair
Merge commit 'ebf0bbaaf03269eda9831e3c6b5ff82010b1de57' into eclair-plus-aosp

* commit 'ebf0bbaaf03269eda9831e3c6b5ff82010b1de57':
  Add better service reporting.
2009-09-03 14:37:37 -07:00
Mike Lockwood
b7677205fa am e131b746: Merge change 23861 into eclair
Merge commit 'e131b7466c8b817896a618efe4b34eed5d3e51f9' into eclair-plus-aosp

* commit 'e131b7466c8b817896a618efe4b34eed5d3e51f9':
  Replace the bugreport symlink with a tool that starts the new dumpstate service.
2009-09-03 14:37:33 -07:00
Android (Google) Code Review
ebf0bbaaf0 Merge change 23868 into eclair
* changes:
  Add better service reporting.
2009-09-03 14:36:28 -07:00
Andrei Popescu
4950b2b695 Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface. 2009-09-03 22:31:55 +01:00
Cynthia Wong
c98cc5a85f am 0aca78bf: am 7a260ba9: Merge change 23824 into eclair
Merge commit '0aca78bf9c68fbdd2863403127837bacb557e91a'

* commit '0aca78bf9c68fbdd2863403127837bacb557e91a':
  Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
2009-09-03 14:19:47 -07:00
Android (Google) Code Review
e131b7466c Merge change 23861 into eclair
* changes:
  Replace the bugreport symlink with a tool that starts the new dumpstate service.
2009-09-03 14:18:51 -07:00
Cynthia Wong
0aca78bf9c am 7a260ba9: Merge change 23824 into eclair
Merge commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3' into eclair-plus-aosp

* commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3':
  Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
2009-09-03 14:18:25 -07:00
Android (Google) Code Review
7a260ba968 Merge change 23824 into eclair
* changes:
  Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
2009-09-03 14:16:57 -07:00
Dianne Hackborn
dd9b82c283 Add better service reporting.
This will be used elsewhere.

Change-Id: Id561fa7fed5eb65446312cb697813483903d33a6
2009-09-03 14:11:02 -07:00
Jaikumar Ganesh
34efc39f25 Implement USIM and add support for importing emails from USIM.
Refer to 3GPP Spec 31.102 for more details.
We read and parse USIM records instead of the RIL doing it for us.
We only support reading of USIM Phonebook records.
2009-09-03 13:55:36 -07:00
Xia Wang
0b92c023b5 am 3f402cbb: am 19d6f7ac: Merge change 23750 into eclair
Merge commit '3f402cbbd25b04d4869cc78586e68c4806eb21ee'

* commit '3f402cbbd25b04d4869cc78586e68c4806eb21ee':
  Add a test case to measure the power usage of loading a web page
2009-09-03 13:39:14 -07:00