10069 Commits

Author SHA1 Message Date
Joe Onorato
368fdba47a am bdf1706a: Merge "Reduce logging." into gingerbread
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
  Reduce logging.
2010-10-19 12:29:43 -07:00
Brad Fitzpatrick
5a67749a35 am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp

* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
  Fix Vibrator permission CTS test broken earlier.
2010-10-19 12:25:46 -07:00
Joe Onorato
bdf1706ac6 Merge "Reduce logging." into gingerbread 2010-10-19 12:23:51 -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
Brad Fitzpatrick
26e9cf38b2 Fix Vibrator permission CTS test broken earlier.
Bug: 3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
2010-10-19 11:02:20 -07:00
Wu-cheng Li
9bf511db85 am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread
Merge commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f' into gingerbread-plus-aosp

* commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f':
  Fix some camera orientation javadoc errors.
2010-10-19 08:44:13 -07:00
Wu-cheng Li
2fe6fcaff4 Fix some camera orientation javadoc errors.
bug:3105659
Change-Id: I0e54f6dd3aa8aeb2494f2596130a5aeb9e1449ba
2010-10-19 19:14:04 +08:00
Sylvain Fonteneau
824de4b3e3 am dd7341f7: Added missing implementation for NdefRecord.
Merge commit 'dd7341f775ca4d86091f4106d6dfef9214073a7d' into gingerbread-plus-aosp

* commit 'dd7341f775ca4d86091f4106d6dfef9214073a7d':
  Added missing implementation for NdefRecord.
2010-10-18 19:13:29 -07:00
Sylvain Fonteneau
dd7341f775 Added missing implementation for NdefRecord.
Implemented constructor using a byte array to parse.
Added missing exception in method declaration, leading to update api/current.xml

Change-Id: I2660484aef1225e90c2f32a572041a2c3aecf288
2010-10-18 19:09:26 -07:00
Dianne Hackborn
69a19fdbff am 3d2818d3: Remove public resource padding.
Merge commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp

* commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8':
  Remove public resource padding.
2010-10-18 18:41:12 -07:00
Dianne Hackborn
3d2818d34f Remove public resource padding.
Change-Id: I8a530a23284a1f2515b1340a1c5e5ed3a0b90780
2010-10-18 18:20:02 -07:00
Brad Fitzpatrick
c9cff071af am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread
Merge commit 'b4157a432cf791906d5b2f6d187f1767357a51bb' into gingerbread-plus-aosp

* commit 'b4157a432cf791906d5b2f6d187f1767357a51bb':
  StrictMode: fix docs to actually compile and add a utility method.
2010-10-18 17:04:55 -07:00
Shimeng (Simon) Wang
b65058a455 am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread
Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp

* commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6':
  Don't force ended when full screen video is returned manually.
2010-10-18 17:04:47 -07:00
Brad Fitzpatrick
b4157a432c Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread 2010-10-18 16:46:03 -07:00
Shimeng (Simon) Wang
6b2274a11b Merge "Don't force ended when full screen video is returned manually." into gingerbread 2010-10-18 16:40:25 -07:00
Brad Fitzpatrick
62a1eb58bf StrictMode: fix docs to actually compile and add a utility method.
Yes, this is a last minute public API change, but I'm already getting
a lot of inquiries about how to use StrictMode on a GB device but
targetting Eclair or Froyo.  I'd like a simple answer involving
reflection, but the current API is too painful to use via reflection.

I imagine this will be a common request, and it's much easier for us
to write a little blog post about trying it out if there's an easy way
to use it with reflection.

Change-Id: I1f21aaac7e61e5e90d1e4facc0c787d8daf089b1
2010-10-18 16:36:39 -07:00
Shimeng (Simon) Wang
43aaa2dd3f Don't force ended when full screen video is returned manually.
issue: 3102273
Change-Id: Id9983a229e103dd255b280638979712873117d10
2010-10-18 16:25:59 -07:00
Nick Pelly
7dced8de38 am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread
Merge commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa' into gingerbread-plus-aosp

* commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa':
  NFC: broadcast intent constants for adapter state change
2010-10-18 15:23:17 -07:00
Nick Pelly
2b51fcb9ac Merge "NFC: broadcast intent constants for adapter state change" into gingerbread 2010-10-18 15:18:59 -07:00
Brad Fitzpatrick
afb082dba5 NFC: broadcast intent constants for adapter state change
These are @hide for now.  Sent by Iec9596a and used in Ief09a5a4

Bug: 3097279
Change-Id: Ie5dc05e33a98366fbe1767d19ac0253651abe862
2010-10-18 15:17:48 -07:00
Adam Powell
6018745fb7 am 9f85ef4a: Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread
Merge commit '9f85ef4aebf510546355866b7cc458551ae3aa7f' into gingerbread-plus-aosp

* commit '9f85ef4aebf510546355866b7cc458551ae3aa7f':
  DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
2010-10-18 14:23:14 -07:00
Adam Powell
48b99ace19 DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
Change-Id: I7f31270c713cdfa3b49f7e9f8d8457c77067516a
2010-10-18 14:00:02 -07:00
Nick Pelly
c2e4daacb4 am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread
Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp

* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
  Prevent use of NFC api if device is not featurized for NFC.
2010-10-18 12:04:16 -07:00
Nick Pelly
1f90908c19 Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread 2010-10-18 12:00:48 -07:00
Nick Pelly
fdf9086e24 Prevent use of NFC api if device is not featurized for NFC.
Change-Id: I8724cb947223b7b60814d0be51e1122123ebb98a
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-18 11:52:28 -07:00
Gilles Debunne
6775754ae3 am 3d01cb93: Merge "Removed "Select word" option on password fields." into gingerbread
Merge commit '3d01cb934ba2c5161689834d49f520313e554571' into gingerbread-plus-aosp

* commit '3d01cb934ba2c5161689834d49f520313e554571':
  Removed "Select word" option on password fields.
2010-10-18 10:26:50 -07:00
Ben Murdoch
06ff27f0cb am 83366dfb: Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread
Merge commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3' into gingerbread-plus-aosp

* commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3':
  Add the HTML5Audio class, to support the audio tag.
2010-10-18 10:26:43 -07:00
Nick Pelly
6b09a90a81 am e47150e9: Fix up NFC permissions.
Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp

* commit 'e47150e933e6f610546f57183477f324566e521e':
  Fix up NFC permissions.
2010-10-18 10:26:12 -07:00
Gilles Debunne
3d01cb934b Merge "Removed "Select word" option on password fields." into gingerbread 2010-10-18 10:16:13 -07:00
Ben Murdoch
83366dfb96 Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread 2010-10-18 10:15:55 -07:00
Nick Pelly
e47150e933 Fix up NFC permissions.
The initial (vendor) implementation had 4 perms, replace with 1.

Requires no permissions:
- Viewing UID, type of discovered tags and cards.
- Viewing the NDEF message contents of NDEF formatted tags and cards.

Requires android.permission.NFC
- Get/Set the local tag "MyTag"
- Creating or using a RawTagConnection (transceive())
- Creating or using a NdefTagConnection (write()/read())

Change-Id: I1b585c7d91738bed6261277061a48cf7c939482a
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-18 10:04:40 -07:00
Nicolas Roard
3d09e139b3 Add the HTML5Audio class, to support the audio tag.
DO NOT MERGE. Cherry pick to GingerBread.

Bug: 3101402
Change-Id: Id7c9418c102d871933c7534fbde18a4bde5f353b
2010-10-18 12:56:02 +01:00
Nick Pelly
774b943fc6 am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Merge commit 'd1f7f4a68375f879671d300510f23d3ee78a500e' into gingerbread-plus-aosp

* commit 'd1f7f4a68375f879671d300510f23d3ee78a500e':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
2010-10-17 17:50:20 -07:00
Nick Pelly
d1f7f4a683 Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Change-Id: I9bb67de2956b1ecb765ca4ac142ed9455060bec4
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 16:30:40 -07:00
Sylvain Fonteneau
73cd4fff52 am a926540d: Implement methods introduced in draft #5 NFC API.
Merge commit 'a926540d5455a973dd8ca19c00c108620d9c68c2' into gingerbread-plus-aosp

* commit 'a926540d5455a973dd8ca19c00c108620d9c68c2':
  Implement methods introduced in draft #5 NFC API.
2010-10-17 15:17:38 -07:00
Sylvain Fonteneau
a926540d54 Implement methods introduced in draft #5 NFC API.
The API is implemented but still do not support muli-protocol tags.

Change-Id: I5cea3eec7b5b92e8e1106d4660e2400e4433e943
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 15:06:45 -07:00
Dianne Hackborn
964eb4389b am 42499170: Implement issue #3094621 and #3094609 - wipe sd card
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue #3094621 and #3094609 - wipe sd card
2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue #3094621 and #3094609 - wipe sd card
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it.  (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)

Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
2010-10-16 16:32:15 -07:00
Romain Guy
157fa0aca5 am 77c011ba: Set default heap size to 5MB.
Merge commit '77c011ba75ee1403c9b7626e4676cd3c8746605b' into gingerbread-plus-aosp

* commit '77c011ba75ee1403c9b7626e4676cd3c8746605b':
  Set default heap size to 5MB.
2010-10-15 19:23:32 -07:00
Romain Guy
77c011ba75 Set default heap size to 5MB.
Change-Id: Iac8ae3cbe6b431767776653c9f430983172cfb6f
2010-10-15 19:15:25 -07:00
Nick Kralevich
21059b637c am 5e7b7cd6: Merge "range checking for tnf" into gingerbread
Merge commit '5e7b7cd65bea53357ecad68a31a52883897c824b' into gingerbread-plus-aosp

* commit '5e7b7cd65bea53357ecad68a31a52883897c824b':
  range checking for tnf
2010-10-15 18:41:59 -07:00
Jeff Brown
6ba052b484 am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread
Merge commit 'c1a564b108c511c0bdd699567c245b031930e718' into gingerbread-plus-aosp

* commit 'c1a564b108c511c0bdd699567c245b031930e718':
  Add support for secure system overlays.  (DO NOT MERGE)
2010-10-15 18:40:39 -07:00
Scott Main
20856f71d9 am c9f7890a: Revise some javadocs for NFC; add package description
Merge commit 'c9f7890a203a013646650a695157277df81b6a17' into gingerbread-plus-aosp

* commit 'c9f7890a203a013646650a695157277df81b6a17':
  Revise some javadocs for NFC; add package description
2010-10-15 18:25:34 -07:00
Shimeng (Simon) Wang
53820a9694 am 7ef6834e: Merge "DO NOT MERGE" into gingerbread
Merge commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7' into gingerbread-plus-aosp

* commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7':
  DO NOT MERGE
2010-10-15 18:25:25 -07:00
Dianne Hackborn
13e46665ff am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread
Merge commit '736f5ec476526f3431d81dec5fb695bdee27e21a' into gingerbread-plus-aosp

* commit '736f5ec476526f3431d81dec5fb695bdee27e21a':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
2010-10-15 18:24:49 -07:00
Shimeng (Simon) Wang
d687504e73 am 31e4d66a: Merge "DO NOT MERGE" into gingerbread
Merge commit '31e4d66ada01ea0714304309967a38d07bfce6c6' into gingerbread-plus-aosp

* commit '31e4d66ada01ea0714304309967a38d07bfce6c6':
  DO NOT MERGE
2010-10-15 18:24:06 -07:00
Leon Scroggins
46ca6a2289 am 36cb18cf: Merge "Line up textfield with WebTextView more often." into gingerbread
Merge commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4' into gingerbread-plus-aosp

* commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4':
  Line up textfield with WebTextView more often.
2010-10-15 18:23:58 -07:00
Scott Main
81df9841c6 am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp

* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
  docs: fix typo; surface dev guide link in package description
2010-10-15 18:23:34 -07:00
Nick Kralevich
5e7b7cd65b Merge "range checking for tnf" into gingerbread 2010-10-15 17:06:30 -07:00
Jean-Baptiste Queru
36e7790b6b Merge a851d8d0 from gingerbread
Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a
2010-10-15 17:02:57 -07:00