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

26834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
58ee2acba8 Check port in create peer's SIP profile. 
SipURI returns port -1 when port is not present in the URI.
Don't call SipProfile.Builder.setPort() when that happens.

Bug: 3291248
Change-Id: I8e608cbc56ea82862df55fdba885f6a864db83ab
 2010-12-16 20:46:50 +08:00
Scott Main
4ea442b49c Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread 2010-12-15 17:47:02 -08:00
Scott Main
58d1966767 cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 
docs: misc changes;
add path to adb tool in sdk;
fix broken link to ninepatch docs;
fix and add some other links

Change-Id: I27c7284ac2db2e6020c9cb0115fb932a2f503033
 2010-12-15 17:44:38 -08:00
Martijn Coenen
c58c3f1ae2 Implement additional Mifare Ultralight convenience methods. 
Change-Id: I8d9dfadb5911b2d11d1ba6dcf1381decbb8386ef
 2010-12-15 16:41:38 -06:00
Martijn Coenen
0d27f999f4 Expose reconnect(), to allow applications to reset tag state. 
Change-Id: Ib5432e7f6b6aaf6ec1cb06693592cb7c6440a6f8
 2010-12-15 16:41:38 -06:00
Martijn Coenen
4049f9d00a Implement multi-tech connect, enfore tech exclusivity. 
- The NfcService now allows for connecting to a specific technology;
- The "active" parts of technology classes may not be used at the same time.

Change-Id: Ibb569f51cc6da4f3e24df9d0850c6f49a022b0c2
 2010-12-15 16:41:38 -06:00
Scott Main
b094b0c4a4 modifications to webinars: 
add the ability to add an upcoming webinar event to Google Calendar;
add some introduction text;
adjust some markup

Change-Id: I4d18a183b1520e79a45e114dc49e725fe27a43c9
 2010-12-15 14:02:59 -08:00
Dianne Hackborn
7daaa98c65 Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread 2010-12-15 12:56:53 -08:00
Scott Main
52078255da cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd 
docs: fix bug 3216642

Change-Id: Ic42d97d4e67a09dc4e366862e2b72ff92f152b85
 2010-12-15 11:49:42 -08:00
Scott Main
6390fa6bdf cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee 
docs: fix bug 3273882

Change-Id: Ie53ba246c39bf448bfe199ae3754e50749ceb340
 2010-12-15 11:47:38 -08:00
Dianne Hackborn
99441c45e4 Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity 
{com.android.settings/com.android.settings.applications.StorageUse}

AbsListView could call mAdapter.getItemId() if a save state happened
after the data changed but before a layout occurred.

Change-Id: Ica020971dc458dff79b56dd810733e217f4f7da6
 2010-12-15 11:02:55 -08:00
Scott Main
92b0308530 cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e 
docs: update to adt 8.0.1;
delete ADT archive page, put a redirect in its place;
update tools release notes and sys reqs to require ant 1.8

Change-Id: Id039d81953452d8f7cefc0c4d61e7d9ead575541
 2010-12-14 17:55:27 -08:00
Scott Main
e09009d6a6 cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 
docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc

Change-Id: Ib6bdc6220543d71b803c78e1c762f84e5b9d55c3
 2010-12-14 17:40:30 -08:00
Scott Main
369c1c1fa2 cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e 
docs: anchor link fixes

Change-Id: I41175d61bb4ee2b0e087515e609e5ebfb19b1ea1
 2010-12-14 17:34:00 -08:00
Scott Main
090a3dc33f cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a 
docs: remove uninstalling link from adt docs
(section was previously removed)

Change-Id: I16e384a12a5ed810cd60dde73c915801745c7cdb
 2010-12-14 17:28:02 -08:00
Scott Main
0846a2f5ec cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72 
docs: update sitemap
add new webmaster tools verification file

Change-Id: I9a261fbb0f863696e257f99a40a9f9a173995d50
 2010-12-14 17:25:06 -08:00
Scott Main
1bcfd85cc0 cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd 
docs: fix syntax error; enlarge screenshot thumbnail

Change-Id: I0fe043969a9754237c6bce6999598033c510d8f3
 2010-12-14 17:03:53 -08:00
Scott Main
e912396076 cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 
docs: misc doc fixes

Change-Id: Ib5f8aaf8feb42c825bc0149ec3775999856f5f57
 2010-12-14 16:42:48 -08:00
Scott Main
93d204ed98 cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df 
docs: fix misc broken links; update some screenshots using windows
bug: 3258882

Change-Id: I3d4a2c66be4e563f4c45d72fec30c9a1b5d8fc23
 2010-12-14 16:39:22 -08:00
Scott Main
071360d1fe cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 
Doc change: Update min glibc version for linux.

Change-Id: I97a79004362e97732fa7d3be07c7396180f5fa99
 2010-12-14 16:35:36 -08:00
Scott Main
b94df62095 cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee 
docs: edit manifest samples to indicate <application> element is always last

Change-Id: I993d130c26efd87147913d5607a2e7f15bd12fe8
 2010-12-14 16:11:02 -08:00
Dianne Hackborn
2bd83c00a0 Merge "Work on issue #3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread 2010-12-14 14:12:37 -08:00
Dianne Hackborn
b2caa06c2e Work on issue #3255640: Need to bump GB to API 10 version name "2.4" 
New API definition for API level 10.

Change-Id: I1d78374ca5a17d568dc6f6b1ae8fb456f4d4aa88
 2010-12-14 11:29:01 -08:00
Dan Morrill
5441a9ff21 Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread 2010-12-14 11:27:20 -08:00
Costin Manolache
a848d34450 Merge "Fix bug in permission grant system." into gingerbread 2010-12-14 10:07:26 -08:00
Roman Nurik
0a97435c8d Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread 2010-12-13 19:12:42 -08:00
Roman Nurik
d602b355ba Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack. 
Change-Id: Ie02e5e5cade3837e863063bcec8fa5c20a83b1ba
 2010-12-13 18:04:41 -08:00
Dan Morrill
096b67f655 GL texture filtering changed from AND to OR, so rename tag name to match. 
(<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs.
supports-screen).

Change-Id: I0f20aed7f95169d9adfc7fe128191eb6e49d116f
 2010-12-13 16:25:54 -08:00
Brad Fitzpatrick
0927c90265 Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 2010-12-13 15:25:09 -08:00
Nick Kralevich
9dbef975f0 Merge "Avoid leaking sockets." into gingerbread 2010-12-13 15:03:28 -08:00
Nick Kralevich
2ed20f8768 Avoid leaking sockets. 
When a DNS lookup fails, we end up creating a datagram socket
but never properly close it.  This wastes limited valuable file
descriptors and causes CTS test failures.  Generally, we should
ensure that sockets or files are opened in a try block, and closed
in a finally block.

Bug: 3276283
Change-Id: I3432f3bc061268c7367948230f6edbdfcec55892
 2010-12-13 14:32:17 -08:00
Dianne Hackborn
e4a5951925 Fix issue #3154576: battery stats checkin should include UID -> packages+ map 
Includes some other small fixes to battery collection and a few
other things.

Output of package info looks like this:

5,0,i,uid,1000,com.android.settings
5,0,i,uid,1000,com.android.providers.subscribedfeeds
5,0,i,uid,1000,com.android.providers.settings
5,0,i,uid,1000,com.android.server.vpn
5,0,i,uid,1000,android
5,0,i,uid,1000,com.android.systemui
5,0,i,uid,1000,com.google.android.backup
5,0,i,uid,1001,com.android.phone
5,0,i,uid,1001,com.android.providers.telephony
5,0,i,uid,1022,com.android.nfc
5,0,i,uid,10021,com.google.android.location
5,0,i,uid,10021,com.google.android.syncadapters.calendar
5,0,i,uid,10021,com.google.android.gsf
5,0,i,uid,10021,com.google.android.syncadapters.contacts
5,0,i,uid,10026,com.android.providers.downloads.ui
5,0,i,uid,10026,com.android.providers.media
5,0,i,uid,10026,com.android.providers.drm
5,0,i,uid,10026,com.android.providers.downloads
5,0,i,uid,10032,com.android.launcher
5,0,i,uid,10039,com.google.android.gm
5,0,i,uid,10041,com.google.android.gallery3d
5,0,i,uid,10049,com.android.providers.calendar

Change-Id: I9e38f254eef146339113ad270f5c6e8b60fb7a1d
 2010-12-13 14:31:40 -08:00
Brad Fitzpatrick
320274c5f1 Fix StrictMode javadoc copy/paste error. 
Change-Id: Idd49111f0a1af6f331cffa0972191b2d4e25a385
 2010-12-13 14:07:39 -08:00
Martijn Coenen
e3f6336bcf Fixed API for active NDEF reading and NDEF formatting. 
- Added getNdefCached() to return the message read at discovery time.
- Fixed format() to check ndef before doing the write:
  libnfc actually requires a checkNdef to be done before writing.

Change-Id: I9b3108299c05539bdef92dd74f62f911fb5a16bf
 2010-12-13 09:58:58 -06:00
Jeff Hamilton
641dd62155 First pass at advanced NFC tag dispatching APIs and other cleanup. 
Change-Id: I022fcd481274a2f68d93218026e77551cfae8cae
 2010-12-10 22:48:16 -06:00
Martijn Coenen
b79173f660 Changed technology close() to reconnect to the tag instead of physical disconnect. 
Change-Id: I8935e4aae452adeec472c0b3ff3c77f1400a264e
 2010-12-10 22:07:46 -06:00
Martijn Coenen
fc5a3b6cfb Changed transceive on all technologies to "raw", except for Mifare classes. 
Change-Id: I3d680e37fec0ab84cdbb70d9fb6fff9527dd76a2
 2010-12-10 22:06:35 -06:00
Martijn Coenen
3300e4c3ea Implemented isWritable() to indicate NDEF capability container r/w state. 
Change-Id: Ie8bdf490c955e620f5e5029346fbe2e188ea4748
 2010-12-10 22:02:09 -06:00
Nick Pelly
ae56a85162 Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread 2010-12-10 17:18:00 -08:00
Nick Pelly
50b4d8f643 Make getSystemService(NFC_SERVICE) the NFC entry point. 
This gives NFC service a handle to the application context.

Deprecate NfcAdapter.getDefaultAdapter(), it does not provide a context.
Using this method will print a warning, and will later throw an exception
if a method that requires a context is called. No 2.3 API's will fail, but
new API's that do require a context might fail.

Also add helper NfcAdapter.getDefaultAdapter(Context).

Change-Id: I9a6378de4ef4b61ad922f8d53e64e2a1a1d5d60c
 2010-12-10 17:12:33 -08:00
Megha Joshi
7a1f15b149 Merge "Integrating webinar hosting with developer.android.com" into gingerbread 2010-12-10 12:30:35 -08:00
Eric Fischer
767926bbe9 Import revised translations. DO NOT MERGE 
Bug 3272618

Change-Id: I165a5964e62e3d3df59c26cf6595898ea3f84996
 2010-12-09 16:54:24 -08:00
Costin Manolache
5d275bba42 Fix bug in permission grant system. 
Change-Id: Ic7d712e5a672c3eded16fee83235db01ab3c74fa
 2010-12-09 16:53:33 -08:00
Megha Joshi
cc0c9daa91 Integrating webinar hosting with developer.android.com 
Change-Id: I320378560bbb09efade14f583dbcf2d66f34a9d8
 2010-12-09 11:42:12 -08:00
Jean-Baptiste Queru
a218e01437 reconcile with open-source gingerbread 
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
 2010-12-09 10:18:23 -08:00
Dianne Hackborn
e59e0309a1 Add more checks for bad values to protect from corrupt files. 
Change-Id: I5e282099e7c6fcc8756146fc7282eec31937af1f
 2010-12-09 07:49:05 -08:00
Kenny Root
63be7a732e Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService 
Be compatible with the old DownloadProvider behavior of being able to
operate on content URIs returned from .insert()

Bug: 3242328
Change-Id: Ibd2ed553c87ea694d4b09a8265c7131fae588719
 2010-12-09 07:48:55 -08:00
Mathias Agopian
e1752f41d3 Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread 2010-12-08 16:17:02 -08:00
James Dong
1f5b133ae2 Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread 2010-12-08 16:14:27 -08:00
James Dong
da1b16ad41 When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again 
bug - 3264094

Change-Id: I291a9b09b335d0eb4acf91f992e59fc44bc57d01
 2010-12-08 15:37:14 -08:00