30173 Commits

Author SHA1 Message Date
Maksymilian Osowski
fddedbf999 Merge "Updated Summarizer to parse CRASH instead of SKIP." 2010-09-02 09:33:08 -07:00
Daniel Sandler
7e04056ca9 Merge "Lights out." 2010-09-02 09:31:19 -07:00
Daniel Sandler
ce70d91844 Lights out.
Not yet wired up to FLAG_FULLSCREEN; right now you must
invoke it manually by longpressing on the clock area.

Bug: 2905073
Change-Id: I43a005f2e4c08edb3673aef523bcaa1e088e8a71
2010-09-02 12:29:26 -04:00
Maksymilian Osowski
2ca8acdb56 Adds webkit revision to the summary and details.
The revision number is taken from external/webkit/WEBKIT_MERGE_REVISION and is served to the java code by apache server. To be able to do that, the new alias directive had to be
added to the run_apache2.py script.

Bug: 2889572
Change-Id: Ie3d147e4d8ea9edd0144b819152121563b8bd759
2010-09-02 17:27:35 +01:00
repo sync
eaa511fd03 Merge "resolved conflicts for merge of 12eaf9d5 to master" 2010-09-02 09:26:24 -07:00
Dmitri Plotnikov
0525f95bb1 Merge "Fixing an issue with convert... utility methods." 2010-09-02 09:24:37 -07:00
repo sync
3d67c5688f resolved conflicts for merge of 12eaf9d5 to master
Change-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d
2010-09-03 00:24:26 +08:00
Dmitri Plotnikov
9a9ce6067f Fixing an issue with convert... utility methods.
All these methods promise to do nothing
if the requested column is not present,
but in fact throw exception.

Change-Id: I0e528d53a0425b831b0083ba82c75ba5b41bfdfd
2010-09-02 09:21:28 -07:00
Maksymilian Osowski
01c1f9d9e9 The results now show which expected result was used.
Bug: 2889857
Change-Id: If2b7e6e6a22ddb5db6c6a50a358e8f263914e6c0
2010-09-02 17:18:48 +01:00
Maksymilian Osowski
5f21f5a4a9 Updated Summarizer to parse CRASH instead of SKIP.
Bug: 2970575
Change-Id: Idc8b514f4878bcd62729a47d7fe681ade114497a
2010-09-02 17:17:06 +01:00
Daniel Sandler
f61f75eb0f Merge "Redesigned system bar and quick settings panel." 2010-09-02 08:36:03 -07:00
Daniel Sandler
d39e388e6d Redesigned system bar and quick settings panel.
Change-Id: Ie26767a8c25af64809cf2fd1d8364791cb7e55ed
2010-09-02 11:34:20 -04:00
Chia-chi Yeh
12eaf9d50c am dc296b0d: Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread
Merge commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6' into gingerbread-plus-aosp

* commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6':
  SipService: reduce the usage of javax.sdp.*.
2010-09-02 08:17:11 -07:00
Chia-chi Yeh
dc296b0d4b Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread 2010-09-02 08:13:01 -07:00
Chia-chi Yeh
95b15c3560 SipService: reduce the usage of javax.sdp.*.
After this change, SipAudioCallImpl is the only place still using it.

Change-Id: I5693bffa54f9e19cbfa70b45dfcf40fba04dedbb
2010-09-02 22:15:26 +08:00
Mike Lockwood
7fdb2a4702 Merge "MTP: try to fix sim build" 2010-09-02 07:14:50 -07:00
Mike Lockwood
602bebd3fc MTP: try to fix sim build
Change-Id: I25b7bbecf61043e326105c74b2244036beda7c43
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-02 09:58:48 -04:00
Maksymilian Osowski
cbba4ae260 Merge "Shows the details when all the tests finish and fixes the orientation issue." 2010-09-02 06:57:50 -07:00
Maksymilian Osowski
84daaf8b41 Merge "Fixed and slightly improved crash detection mechanism." 2010-09-02 06:55:13 -07:00
Maksymilian Osowski
1b034781f4 Shows the details when all the tests finish and fixes the orientation issue.
The tests no longer restart when orientation changes.

Bug: 2904456
Change-Id: Ie1ee463dbd63fb1a2ad2e9c28bf5989002f22215
2010-09-02 14:49:04 +01:00
Daniel Sandler
1770b87289 Merge "Fix longpress on Menu showing IME." 2010-09-02 06:38:35 -07:00
Hung-ying Tyan
e93a492166 am 18dfae22: am 60264b30: SipProfile: remove outgoingCallAllowed flag.
Merge commit '18dfae226b0f9d3983226eb6cd377fc937b30730'

* commit '18dfae226b0f9d3983226eb6cd377fc937b30730':
  SipProfile: remove outgoingCallAllowed flag.
2010-09-02 05:43:59 -07:00
Hung-ying Tyan
18dfae226b am 60264b30: SipProfile: remove outgoingCallAllowed flag.
Merge commit '60264b306453a3043442719b970f2edb3f46f51b' into gingerbread-plus-aosp

* commit '60264b306453a3043442719b970f2edb3f46f51b':
  SipProfile: remove outgoingCallAllowed flag.
2010-09-02 05:40:58 -07:00
Maksymilian Osowski
bcf114c2bb Fixed and slightly improved crash detection mechanism.
Before, if a crash was detected, but the "Force quit" dialog remained on the screen, sending the intent to restart the executor would do nothing. It's fixed now with default
uncaught exception handler. Also, when we catch the uncaught exception, we can restart the executor straight away, without waiting for the time-out.

Change-Id: I2f0b4b5f2abd180ff518f1a40ad1294bed2f7f67
2010-09-02 13:39:11 +01:00
Hung-ying Tyan
60264b3064 SipProfile: remove outgoingCallAllowed flag.
Change-Id: I37a215bafce57adf6911c81fd38db324bac686ec
2010-09-02 20:34:17 +08:00
Maksymilian Osowski
f072bced91 Merge "Updated Summarizer to report tests under all 4 possible categories now." 2010-09-02 04:55:24 -07:00
Maksymilian Osowski
6ae5ce4b40 Updated Summarizer to report tests under all 4 possible categories now.
Categories: ((un)expected passes/failures).
Also, FileFilter uses FAIL instead of IGNORE_RESULTS now.

Bug: 2899965
Change-Id: I06835b3d5cea84cbc92225a940bf7361cf832f59
2010-09-02 12:53:26 +01:00
Maksymilian Osowski
15116bcc76 Merge "Fixed a bug when there are too many open sockets." 2010-09-02 03:36:57 -07:00
Maksymilian Osowski
5926723f82 Fixed a bug when there are too many open sockets.
Also, some minor corrections to shutdown() in ConnectionHandler.

Change-Id: I937f200c14c185b0867f997645d8b288a19b9889
2010-09-02 11:34:03 +01:00
Maksymilian Osowski
4cf63e57ac Merge "Added "run all tests in the current directory" menu option." 2010-09-02 03:19:37 -07:00
Maksymilian Osowski
ff314d7094 Added "run all tests in the current directory" menu option.
Bug: 2906954
Change-Id: Ib68219dc4d4d517ad859679bc8d52a02b0b631f4
2010-09-02 10:25:45 +01:00
Jason Chen
9cefc6482b Merge "Update current.xml to fix the build" 2010-09-02 00:45:45 -07:00
Adam Powell
8b95d26093 am 0358def7: (-s ours) am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread
Merge commit '0358def77633b6548da06985cb22955a7e85abac'

* commit '0358def77633b6548da06985cb22955a7e85abac':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.
2010-09-02 00:33:29 -07:00
Adam Powell
0358def776 am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp

* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.
2010-09-02 00:31:03 -07:00
Adam Powell
79492a0d75 Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 2010-09-02 00:28:14 -07:00
Jason Chen
90cb9d04fe Update current.xml to fix the build
Change-Id: I85a01bced5a72a7a5298daec008a779c6239d305
2010-09-02 00:26:15 -07:00
Adam Powell
5916882c3f DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Change-Id: I367643877a397e7b4fa9bd8c40639ff69436e7f0
2010-09-02 00:14:53 -07:00
Dianne Hackborn
a5034b5d80 am 75823339: am a1c69e08: Fix a small bug when granting permissions through activity results.
Merge commit '75823339cd03e5b25b576cd7a2b5941254017c4a'

* commit '75823339cd03e5b25b576cd7a2b5941254017c4a':
  Fix a small bug when granting permissions through activity results.
2010-09-01 23:20:18 -07:00
Dianne Hackborn
75823339cd am a1c69e08: Fix a small bug when granting permissions through activity results.
Merge commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4' into gingerbread-plus-aosp

* commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4':
  Fix a small bug when granting permissions through activity results.
2010-09-01 23:17:20 -07:00
Dianne Hackborn
8f5edc93b6 am 840f0fec: am d3efa392: Clean up some permissions.
Merge commit '840f0fecd87357cadf4b2a0ae96d30b457f89729'

* commit '840f0fecd87357cadf4b2a0ae96d30b457f89729':
  Clean up some permissions.
2010-09-01 22:55:04 -07:00
Dianne Hackborn
a1c69e084b Fix a small bug when granting permissions through activity results.
Change-Id: I2a5c4025fb5f566e29c219fde4d50ed2eba6e174
2010-09-01 22:55:02 -07:00
Dianne Hackborn
840f0fecd8 am d3efa392: Clean up some permissions.
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp

* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
  Clean up some permissions.
2010-09-01 22:51:35 -07:00
Jim Miller
0ed0221e9c Merge "Fix 2579224: Add a separate timeout for lockscreen vs display" 2010-09-01 21:41:51 -07:00
Joe Onorato
2de8a82643 Merge "Revert "Changed ConnectivityService#getServiceInstance so its a singleton."" 2010-09-01 21:23:37 -07:00
Dianne Hackborn
949498de66 am 14d56840: am bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread
Merge commit '14d56840eeec537c037bebaeaebf1b37f48d8dad'

* commit '14d56840eeec537c037bebaeaebf1b37f48d8dad':
  Improve messages when java process is starting.
2010-09-01 21:21:42 -07:00
Dianne Hackborn
d3efa39244 Clean up some permissions.
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.

Also deprecate the activity API to go in the foreground.  I didn't
realize that was released in the SDK.  It needs to go away.

Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
2010-09-01 21:19:40 -07:00
Dianne Hackborn
14d56840ee am bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread
Merge commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp

* commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1':
  Improve messages when java process is starting.
2010-09-01 21:18:31 -07:00
Joe Onorato
00092874b1 Revert "Changed ConnectivityService#getServiceInstance so its a singleton."
This reverts commit 28961cc02f350ccd1770fb5af2f0d4c9793e4aec which causes this exception:

E/SystemServer( 2653): Failure starting Connectivity Service
E/SystemServer( 2653): java.lang.IllegalMonitorStateException: object not locked by thread before wait()
E/SystemServer( 2653):  at java.lang.Object.wait(Native Method)
E/SystemServer( 2653):  at java.lang.Object.wait(Object.java:358)
E/SystemServer( 2653):  at com.android.server.ConnectivityService$ConnectivityThread.getServiceInstance(ConnectivityService.java:186)
E/SystemServer( 2653):  at com.android.server.ConnectivityService.getInstance(ConnectivityService.java:200)
E/SystemServer( 2653):  at com.android.server.ServerThread.run(SystemServer.java:262)

Change-Id: Idd139e426e61a1913b0bf343e2f0a0b1990ba8bb
2010-09-01 21:18:22 -07:00
Dianne Hackborn
bc5ec2f91a Merge "Improve messages when java process is starting." into gingerbread 2010-09-01 21:15:17 -07:00
Jim Miller
bc4603b0b1 Fix 2579224: Add a separate timeout for lockscreen vs display
This change adds a second timeout to the SecuritySettings page
separate from the standard display timeout.

Change-Id: I41fe10e31688308f52695ad3ee30a4b0507112bd
2010-09-01 21:00:30 -07:00