drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,430 Commits 1 Branch 0 Tags
Commit Graph

52430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Hamby
ae62b7b0bc resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
 2011-06-07 16:24:15 -07:00
Adam Powell
7ed8ff18ce am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 
* commit '68b81434963db90e0d5b14710e4edd86084ede3c':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
 2011-06-07 16:22:32 -07:00
Adam Powell
68b8143496 Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 2011-06-07 16:19:26 -07:00
Adam Powell
982cb98393 Fix bug 4533120 - rough handling of invalid event streams in 
ScaleGestureDetector

Make ScaleGestureDetector a bit more tolerant of bogus event streams.

Change-Id: I28a8b1ea494b7f1ca9d4c4623b95aee38f213369
 2011-06-07 16:13:51 -07:00
Brian Carlstrom
c8307c885f Merge "Change KeyChain to assume PEM encoded keystore entries" 2011-06-07 15:57:29 -07:00
Frank Sposaro
34687664be Merge "Fixed typo. "a a" -> "a"" 2011-06-07 15:57:11 -07:00
Jesse Wilson
7ad00e6f5c Use external/mockwebserver in frameworks/base 
Change-Id: Ifb45671e3e7256692c74587984ee5fe1d0eca181
 2011-06-07 15:57:10 -07:00
John Wang
229d3a0cbc am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 
* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
  Make getDeviceId return null for Non-phone device.
 2011-06-07 15:56:19 -07:00
Dianne Hackborn
816e5b7219 am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2 
* commit 'ee3de4a950a188c6a4d5fb732242249af4807837':
  Remove compat mode dialog.
 2011-06-07 15:56:05 -07:00
Dianne Hackborn
891266e36e am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit 'b5b98f877a09907a9a3b0c7e590e6e0ddd575158':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-07 15:52:38 -07:00
John Wang
fc94d45fc2 Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 2011-06-07 15:49:34 -07:00
Dianne Hackborn
ee3de4a950 am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2 
* commit 'a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
  Remove compat mode dialog.
 2011-06-07 15:47:14 -07:00
Dianne Hackborn
a3ce0f1e6f Merge "Remove compat mode dialog." into honeycomb-mr2 2011-06-07 15:45:14 -07:00
Dianne Hackborn
2947826931 Remove compat mode dialog. 
Change-Id: I37bccdf9d3e7c56048633da5731ad111910e530f
 2011-06-07 15:44:22 -07:00
Dianne Hackborn
b5b98f877a am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit 'dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-07 15:39:43 -07:00
John Wang
e19736f052 Make getDeviceId return null for Non-phone device. 
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
 2011-06-07 15:37:09 -07:00
Christopher Tate
0a251cd5ee Merge "Don't ack/nak backup redundantly at exit" 2011-06-07 15:37:08 -07:00
Dianne Hackborn
dfe824ef3e Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 2011-06-07 15:36:51 -07:00
Christopher Tate
ec5d4a0f97 Don't ack/nak backup redundantly at exit 
Change-Id: I7293518bc2fe6c66270a7c8aea3bf0c0829754e4
 2011-06-07 15:35:45 -07:00
Brian Carlstrom
9d7faa91be Change KeyChain to assume PEM encoded keystore entries 
Summary:
- Changed KeyChain to assume PEM encoded keystore entries
- Moved convertToPem from CertInstaller for reuse with other Credentials helpers
- Added convertFromPem for use decoding keystore entries

Change-Id: I340168b88aefa458d01e81324824e2e08b1d7c4e
 2011-06-07 15:33:09 -07:00
Christopher Tate
ba4b2faa09 Merge "Fix embedded spaces in tar stream EVEN HARDER" 2011-06-07 15:20:34 -07:00
Irfan Sheriff
2391a98314 Merge "Update walled garden detection logic" 2011-06-07 15:16:00 -07:00
Irfan Sheriff
5ea65d609f Update walled garden detection logic 
DNS based techniques dont always work. Some hotspots
redirect on data fetch on IP. Use a known pattern match
on URL to detect a walled garden instead.

Also, added gservices capability to turn off the feature
or change the URL & the pattern to match

Bug: 4378442
Change-Id: I78b4208d3ea3ace20069169e7c01ed769892d94d
 2011-06-07 15:10:58 -07:00
Xavier Ducrohet
3eb9f8326e am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread 
* commit '67f09cd090adae6365ca36546b0a517e51255876':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
 2011-06-07 15:09:39 -07:00
Xavier Ducrohet
e1d14a29ff am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 
* commit 'ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
 2011-06-07 15:09:31 -07:00
Romain Guy
34e9f249a9 am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." 
* commit 'fbef58faad5a31faf36294e4d160cbd148ed5458':
  Disable plugins if setPluginsEnabled(false) called.
 2011-06-07 15:09:02 -07:00
Jake Hamby
7ca13deb40 Merge "resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-06-07 15:03:51 -07:00
Mathias Agopian
c8c39b6c5b am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE) 
* commit 'a6a4a9ed46d02ec0c6493a97cd1d3351bdcced63':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
 2011-06-07 15:02:53 -07:00
Jake Hamby
7d259626d0 resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp 
Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
 2011-06-07 15:01:50 -07:00
Mathias Agopian
a6a4a9ed46 am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE) 
* commit 'f6c8206735e7e078461e5f2aef6e1a1446fdd075':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
 2011-06-07 14:58:02 -07:00
Mathias Agopian
f6c8206735 fix a surface leak introduced by a failed merge (DO NOT MERGE) 
Bug: 4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
 2011-06-07 14:52:22 -07:00
Amith Yamasani
0df77e6d42 Merge "Volume Panel sizing for phones." 2011-06-07 14:48:50 -07:00
Fabrice Di Meglio
c46f7ffa90 Rename atribute View horizontalDirection to layoutDirection and update unit tests 
- update before/after to start/end in unit test app

Change-Id: Id7286ef5d9390540faf8ecd5f0b1c140d04bb364
 2011-06-07 14:21:31 -07:00
Daniel Sandler
56e6dbd8b1 DO NOT MERGE. Experimental compatibility mode UI. 
♫ Just another button, for you and me, in the status bar. ♫

(cherry picked from commit 45c0401a0647a5fdc5f37168463c14ad57c5644b)

Change-Id: Ib35d136deadf16f693003b61ea6cfee411f4aa3d
 2011-06-07 14:11:09 -07:00
Irfan Sheriff
92593dc49b am 84db79bb: Merge "Clear IP configuration on lost network" into honeycomb-LTE 
* commit '84db79bb65bce5c1fd8a6e033cb7e4db4c04f9b1':
  Clear IP configuration on lost network
 2011-06-07 13:44:40 -07:00
Irfan Sheriff
84db79bb65 Merge "Clear IP configuration on lost network" into honeycomb-LTE 2011-06-07 13:40:38 -07:00
Yu Shan Emily Lau
fd65e00d62 Merge "Cleaned up the old test cases and test media files." 2011-06-07 13:40:04 -07:00
Daniel Sandler
18cee202a0 Merge "Experimental compatibility mode UI." 2011-06-07 13:37:08 -07:00
Andreas Huber
752a5b3df5 am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. 
* commit '8e97372913c9236ffdee175c6da99dc00c22b3e1':
  DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
 2011-06-07 13:23:54 -07:00
Martijn Coenen
4c5f2a9dd2 am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. 
* commit 'ed1c8d7dc09996351db711be7d2acf0ff4715c2d':
  Prevent allocation overflows by corrupt NDEF records.
 2011-06-07 13:23:11 -07:00
Christopher Tate
3f6c77b7ca Fix embedded spaces in tar stream EVEN HARDER 
Change-Id: I97ac586ff3541a05d73e1e53f680517c15e6c662
 2011-06-07 13:17:17 -07:00
John Wang
1f8665895f am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 
* commit '71030e536522449f34dc584fda94f34e7be6ee19':
  Add SIM PUK unlockscreen.
 2011-06-07 13:16:09 -07:00
Robert Greenwalt
e139167c91 am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE 
* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
  Reveal some network constants.
 2011-06-07 13:12:29 -07:00
John Wang
71030e5365 Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 2011-06-07 12:56:49 -07:00
Robert Greenwalt
5df69fad6e resolved conflicts for merge of 8de47a2f to honeycomb-LTE 
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
 2011-06-07 12:45:41 -07:00
Mike Lockwood
65abc4531f Merge "StorageVolume: Add allowMassStorage flag" 2011-06-07 12:44:52 -07:00
Mike Lockwood
8e8b280bd1 StorageVolume: Add allowMassStorage flag 
Change-Id: I9d19e635bb06e50068d7e4e6919322bd5bb2e00f
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-07 12:43:49 -07:00
Irfan Sheriff
0c13d47939 Clear IP configuration on lost network 
Bug: 4391449
Change-Id: I574128083a5612f13fcccaf5ed091eae114b7943
 2011-06-07 12:29:59 -07:00
Daniel Sandler
45c0401a06 Experimental compatibility mode UI. 
♫ Just another button, for you and me, in the status bar. ♫

Change-Id: I11ecac63341d4c421dbaffba931861605ebad286
 2011-06-07 15:29:07 -04:00
Christopher Tate
ffccff0864 Merge "Implement shared-storage full backup/restore" 2011-06-07 12:25:06 -07:00