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

29613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jean-Baptiste Queru
4b94c451d2 Merge "Added dropbox broadcast notification" 2010-12-13 12:34:48 -08:00
Martijn Coenen
6c2471649b am e3f6336b: Fixed API for active NDEF reading and NDEF formatting. 
* commit 'e3f6336bcffc250da90ec864bccfa73ad1d016b9':
  Fixed API for active NDEF reading and NDEF formatting.
 2010-12-13 08:14:01 -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
80c78a896f am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup. 
* commit '641dd62155fd2eeddd93b2036154b13c05b70ba2':
  First pass at advanced NFC tag dispatching APIs and other cleanup.
 2010-12-11 20:58:38 -08: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
41e74b991b am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect. 
* commit 'b79173f6602359d00a1a89f4d6505a44d461d796':
  Changed technology close() to reconnect to the tag instead of physical disconnect.
 2010-12-10 20:40:40 -08:00
Martijn Coenen
2019f53396 am fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes. 
* commit 'fc5a3b6cfb85679e82a39730c7154b55b0711a0c':
  Changed transceive on all technologies to "raw", except for Mifare classes.
 2010-12-10 20:40:34 -08:00
Martijn Coenen
25556f6669 am 3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state. 
* commit '3300e4c3ea2f2317532ded6f9e79d6ad9e038679':
  Implemented isWritable() to indicate NDEF capability container r/w state.
 2010-12-10 20:40:26 -08: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
1d0d1188d7 am ae56a851: Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread 
* commit 'ae56a851624c2b2e78da8a2c339d2caa64c4f981':
  Make getSystemService(NFC_SERVICE) the NFC entry point.
 2010-12-10 17:19:45 -08: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
87c03b58a9 am 7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread 
* commit '7a1f15b1497ba2a79243448f6ac5617264f8c8d3':
  Integrating webinar hosting with developer.android.com
 2010-12-10 12:33:59 -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
af22f4f16d am 767926bb: Import revised translations. DO NOT MERGE 
* commit '767926bbe90358bc3857f4b78f54c8cdacfb8773':
  Import revised translations.  DO NOT MERGE
 2010-12-10 10:03:55 -08:00
Jean-Baptiste Queru
81266d9936 am a218e014: reconcile with open-source gingerbread 
* commit 'a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
 2010-12-10 08:49:37 -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
Wink Saville
a740413022 am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card." 
* commit 'd0ffef4b43594e540cb867da18d4403b4f583622':
  Fix for phone app crash in Icc Card.
 2010-12-09 14:02:09 -08:00
Wink Saville
d0ffef4b43 am 19b23afa: Merge "Fix for phone app crash in Icc Card." 
* commit '19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
  Fix for phone app crash in Icc Card.
 2010-12-09 13:58:26 -08:00
Wink Saville
19b23afadf Merge "Fix for phone app crash in Icc Card." 2010-12-09 13:50:28 -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
1bec55bd24 am d9c17cc1: merge from gingerbread 
* commit 'd9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
  Add more checks for bad values to protect from corrupt files.
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
 2010-12-09 10:45:29 -08:00
Jean-Baptiste Queru
a218e01437 reconcile with open-source gingerbread 
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
 2010-12-09 10:18:23 -08:00
Jean-Baptiste Queru
d9c17cc117 merge from gingerbread 
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
 2010-12-09 09:11:06 -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
Wink Saville
cc41b92ed7 am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 
* commit '0a5ae453e50144b31c7f544714feb5bbc7b77d18':
  frameworks/base/telephony: Release wakelock on RIL request send error
 2010-12-08 21:57:03 -08:00
Wink Saville
0a5ae453e5 am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 
* commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
  frameworks/base/telephony: Release wakelock on RIL request send error
 2010-12-08 21:53:24 -08:00