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

29594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
61aeb2b721 am b094b0c4: modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup 
* commit 'b094b0c4a4309f48d9da7253de78ebda20a8a81c':
  modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
 2010-12-15 14:11:08 -08: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
b32ea25529 am 7daaa98c: Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread 
* commit '7daaa98c6531373a2a742c1360f0a2795de0619f':
  Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity
 2010-12-15 12:58:54 -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
9278d32168 am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642 
* commit '52078255dacabe9b779613b032a4dc3706b2b5d3':
  cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
 2010-12-15 11:56:04 -08:00
Scott Main
d88c90fb08 am 6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882 
* commit '6390fa6bdf50a3bf10cd6c54328397fe709f7c37':
  cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
 2010-12-15 11:56:00 -08:00
Scott Main
8591872a5c am 92b03085: 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 
* commit '92b0308530d21195425c918cbe6057dd84f37992':
  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
 2010-12-15 11:53:20 -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
f6847bf386 am e09009d6: cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc 
* commit 'e09009d6a63cfab2a64d02ca49a462d46e62f750':
  cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc
 2010-12-14 17:45:24 -08:00
Scott Main
3354f4dc3d am 369c1c1f: cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes 
* commit '369c1c1fa22802b6504c5cde533d797841700a66':
  cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
 2010-12-14 17:42:28 -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
3c585db26c am 090a3dc3: cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a docs: remove uninstalling link from adt docs (section was previously removed) 
* commit '090a3dc33fbb0d450dd5823fd2756360e4acdd12':
  cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a docs: remove uninstalling link from adt docs (section was previously removed)
 2010-12-14 17:34:35 -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
cb27bc7d29 am 0846a2f5: cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72 docs: update sitemap add new webmaster tools verification file 
* commit '0846a2f5ec77a8862d92430b6721da0960d0d001':
  cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72 docs: update sitemap add new webmaster tools verification file
 2010-12-14 17:30:04 -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
14e6325da9 am 1bcfd85c: cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail 
* commit '1bcfd85cc0f274b250b68a122f964b276ef4be4a':
  cherrypick Change-Id: I56db12e2444e5020cd72a0c974539e777a7f1ebd docs: fix syntax error; enlarge screenshot thumbnail
 2010-12-14 17:06:58 -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
84bf9bc70f am e9123960: cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes 
* commit 'e9123960764d7b2e94fb0d68aae21fccc472abcd':
  cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes
 2010-12-14 16:48:38 -08:00
Scott Main
a925b6a64c am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882 
* commit '93d204ed98019322e434b714c7c0a619d69f24f5':
  cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
 2010-12-14 16:43:28 -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
627b78f49d am 071360d1: cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux. 
* commit '071360d1fe5cb75925e5a7ff1b799c5cab160a44':
  cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63 Doc change: Update min glibc version for linux.
 2010-12-14 16:40:39 -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
178d500551 am b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last 
* commit 'b94df620959de658990c1ed1263e2e1c42df7f6b':
  cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
 2010-12-14 16:22:56 -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
042042b809 am 2bd83c00: Merge "Work on issue #3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread 
* commit '2bd83c00a0c72d3f6bd929c4df5fe83ee31b4704':
  Work on issue #3255640: Need to bump GB to API 10 version name "2.4"
 2010-12-14 14:15:16 -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
0ccc8b7345 am 5441a9ff: 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 
* commit '5441a9ff2128cf2c5088974c74b79d2d1734f755':
  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).
 2010-12-14 11:28:50 -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
7afa161368 am a848d344: Merge "Fix bug in permission grant system." into gingerbread 
* commit 'a848d3445090e114cbfe61f1c7449122a665fba6':
  Fix bug in permission grant system.
 2010-12-14 10:14:10 -08:00
Costin Manolache
a848d34450 Merge "Fix bug in permission grant system." into gingerbread 2010-12-14 10:07:26 -08:00
Roman Nurik
483654fb72 am 0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread 
* commit '0a97435c8d776746bb3dcf16824e2cc81eee20aa':
  Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
 2010-12-13 19:15:28 -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
2d5b11aba0 am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 
* commit '0927c9026537166cec36b2f9bb8a764ef8a7c606':
  Fix StrictMode javadoc copy/paste error.
 2010-12-13 15:27:25 -08:00
Brad Fitzpatrick
0927c90265 Merge "Fix StrictMode javadoc copy/paste error." into gingerbread 2010-12-13 15:25:09 -08:00
Nick Kralevich
30ad1e576a am 9dbef975: Merge "Avoid leaking sockets." into gingerbread 
* commit '9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
  Avoid leaking sockets.
 2010-12-13 15:05:20 -08:00
Nick Kralevich
9dbef975f0 Merge "Avoid leaking sockets." into gingerbread 2010-12-13 15:03:28 -08:00
Dianne Hackborn
78e9f4cbae am e4a59519: Fix issue #3154576: battery stats checkin should include UID -> packages+ map 
* commit 'e4a5951925f16f18dae91ed65567e96528f17fee':
  Fix issue #3154576: battery stats checkin should include UID -> packages+ map
 2010-12-13 14:37:09 -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
Jean-Baptiste Queru
6d13b146e0 am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master 
* commit 'e78a000955c283509ee8a21b8b7e448060ac8dd8':
  Added dropbox broadcast notification
 2010-12-13 13:10:23 -08:00
Jean-Baptiste Queru
e78a000955 resolved conflicts for merge of 4b94c451 to stage-korg-master 
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
 2010-12-13 13:06:13 -08:00