Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,918 Commits 3 Branches 0 Tags
fcf485177c6a75182c2dc9f7edfbcd55ea337aa3
Commit Graph

1377 Commits

Author SHA1 Message Date
Daniel Lehmann
0b0a184669 am 5247fb38: am cc21cc01: Merge "Allow clearing out the source bounds" into ics-mr0 
* commit '5247fb38be85efda56ff062585912a229872749b':
  Allow clearing out the source bounds
 2011-10-12 21:11:43 -07:00
Daniel Lehmann
cc21cc017b Merge "Allow clearing out the source bounds" into ics-mr0 2011-10-12 18:16:15 -07:00
Daniel Lehmann
a5b58df097 Allow clearing out the source bounds 
Change-Id: Id49f4a3ac397cf17c5704d298b6a9a376f6a5c23
 2011-10-12 16:24:22 -07:00
Jeff Brown
2b60484225 am 241fe477: am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0 
* commit '241fe477edba539bcc58df4410c307d9540a4233':
  Use ashmem for CursorWindows. Bug: 5332296
 2011-10-12 12:37:46 -07:00
Jeff Brown
0cde89f5f0 Use ashmem for CursorWindows. 
Bug: 5332296

The memory dealer introduces additional delays for reclaiming
the memory owned by CursorWindows because the Binder object must
be finalized.  Using ashmem instead gives CursorWindow more
direct control over the lifetime of the shared memory region.

The provider now allocates the CursorWindows and returns them
to clients with a read-only protection bit set on the ashmem
region.

Improved the encapsulation of CursorWindow.  Callers shouldn't
need to care about details like how string fields are allocated.

Removed the compile-time configuration of string and numeric
storage modes to remove some dead weight.

Change-Id: I07c2bc2a9c573d7e435dcaecd269d25ea9807acd
 2011-10-11 11:03:19 -07:00
Dianne Hackborn
091ff486ab am 94e8471a: Merge "Fix issue #5405788: Device continuously opening and closing..." 
* commit '94e8471a956d46f4fae3da2b1e79862e07209efa':
  Fix issue #5405788: Device continuously opening and closing...
 2011-10-10 16:10:02 -07:00
Dianne Hackborn
58f42a59bd Fix issue #5405788: Device continuously opening and closing... 
...the "Complete action using" dialog

When an application goes idle, it sends back to the activity manager
the configuration it last used, to make sure the two don't get out
of sync.  Fix a bunch of edge cases here in dealing with that, and
be sure to also send the current configuration when launching an
activity so the client is always up-to-date when launching.

Also a small fix to not show the upgrading dialog during first boot.

Change-Id: I14ed366a87cd689d1c78787369e052422290ac6f
 2011-10-10 14:53:08 -07:00
Jeff Brown
01b2e96bc2 am 184b44e7: Merge "Fix ownership of CursorWindows across processes. Bug: 5332296" 
* commit '184b44e79406e5f7e4f68673277c9637c6451b55':
  Fix ownership of CursorWindows across processes. Bug: 5332296
 2011-10-10 14:07:36 -07:00
Jeff Brown
184b44e794 Merge "Fix ownership of CursorWindows across processes. Bug: 5332296" 2011-10-10 14:06:09 -07:00
Jeff Brown
10628ccc66 am 222b92a7: Merge "Implement CloseGuard in ContentResolver." 
* commit '222b92a7322346e544188ca040bef1e27ab2b71a':
  Implement CloseGuard in ContentResolver.
 2011-10-10 11:51:33 -07:00
Jeff Brown
f2569eeee3 am 326e8748: Merge "Clean up handrolled Binder proxies. Bug: 5332296" 
* commit '326e8748f082f3c794fcfcd7c87c688a0564a964':
  Clean up handrolled Binder proxies. Bug: 5332296
 2011-10-10 11:51:32 -07:00
Jeff Brown
222b92a732 Merge "Implement CloseGuard in ContentResolver." 2011-10-10 11:48:49 -07:00
Jeff Brown
326e8748f0 Merge "Clean up handrolled Binder proxies. Bug: 5332296" 2011-10-10 11:48:39 -07:00
Jeff Brown
d2183654e0 Fix ownership of CursorWindows across processes. 
Bug: 5332296

Ensure that there is always an owner for each CursorWindow
and that references to each window are acquired/released
appropriately at all times.

Added synchronization to CursorToBulkCursorAdaptor to
prevent the underlying Cursor and CursorWindow from being
remotely accessed in ways that might violate invariants,
resulting in leaks or other problems.

Ensured that CursorToBulkCursorAdaptor promptly releases
its references to the Cursor and CursorWindow when closed
so they don't stick around longer than they should, even
if the remote end hangs onto the IBulkCursor for some reason.

CursorWindow respects Parcelable.FLAG_WRITE_RETURN_VALUE
as an indication that one reference to the CursorWindow is
being released.  Correspondingly, CursorToBulkCursorAdaptor
acquires a reference to the CursorWindow before returning
it to the caller.  This change also prevents races from
resulting in the transfer of an invalid CursorWindow over
the wire.

Ensured that BulkCursorToCursorAdaptor promptly releases
its reference to the IBulkCursor when closed and throws
on attempts to access the cursor while closed.

Modified ContentProviderNative to handle both parts of
the wrapping and unwrapping of Cursors into IBulkCursors.
This makes it a lot easier to ensure that the right
things happen on both ends.  Also, it turns out that
the only caller of IContentProvider.bulkQuery was
ContentProviderNative itself so there was no need
to support bulkQuery on ContentProviderProxy and it was
just getting in the way.

Implement CloseGuard on CursorWindow.

Change-Id: Ib3c8305d3cc62322f38a06698d404a2989bb6ef9
 2011-10-09 22:10:36 -07:00
Dianne Hackborn
d1270cee86 am f6497e45: Merge "Calling close() outside of the main thread breaks stuff." 
* commit 'f6497e45fae88788b1c67d815458355a1f2f65b5':
  Calling close() outside of the main thread breaks stuff.
 2011-10-09 17:16:15 -07:00
Dianne Hackborn
229edbc38d Calling close() outside of the main thread breaks stuff. 
Too dangerous to fix at this point.

Change-Id: I7de5bfecd757fbae635b02c2c2d9ba7ce3bcb435
 2011-10-09 16:01:40 -07:00
Jeff Brown
baaf8c3f55 Implement CloseGuard in ContentResolver. 
Also, don't try to close the cursor from the finalizer,
it just won't work because quite probably the Binder underneath
it has already been finalized or is about to be.

Change-Id: I6363cd30f32abe15412948d126e0bcc5f62943c5
 2011-10-09 15:01:10 -07:00
Dianne Hackborn
e74f480bd1 am 421fa274: Fix issue #5418999: [From My Phone] - ANR when navigating back from OneUp view 
* commit '421fa2744556d6483007bc2a6a1e4030811142f9':
  Fix issue #5418999: [From My Phone] - ANR when navigating back from OneUp view
 2011-10-09 13:13:36 -07:00
Jeff Brown
df6611d8c0 Clean up handrolled Binder proxies. 
Bug: 5332296

We can't replace these with AIDL generated proxies just yet, but
at least we can make them a little more conformant.

Change-Id: I1814f76d0f9c5e44a7fd85a12b2e3c2b7e3c9daa
 2011-10-09 13:00:35 -07:00
Dianne Hackborn
421fa27445 Fix issue #5418999: [From My Phone] - ANR when navigating back from OneUp view 
Close cursors asynchronously.

Change-Id: I32c106d26c0443710789344bf823c288eaf31db5
 2011-10-09 12:50:45 -07:00
Joe Fernandez
90b66cb321 am cac15eb2: Merge "docs: add developer guide cross-references, Project ACRE" 
* commit 'cac15eb21cab68e5b76fe06f9aff273978c92054':
  docs: add developer guide cross-references, Project ACRE
 2011-10-04 14:04:53 -07:00
Joe Fernandez
cac15eb21c Merge "docs: add developer guide cross-references, Project ACRE" 2011-10-04 14:03:12 -07:00
Joe Fernandez
b54e7a3d9f docs: add developer guide cross-references, Project ACRE 
Change-Id: I5df1c4e13af67ff4c4a5b22f3cb1247bf0103b09
 2011-10-04 13:57:00 -07:00
Alon Albert
b69595c943 am 62abf34d: Merge "Update dumpsys output" 
* commit '62abf34d0dce0deb017b18beef3d8f73bd90981a':
  Update dumpsys output
 2011-10-04 08:41:25 -07:00
Alon Albert
62abf34d0d Merge "Update dumpsys output" 2011-10-04 08:39:46 -07:00
Dianne Hackborn
e08ce59a1d am 7d657e5c: Merge "Add mechanism for Parcel to not allow FDs to be written to it." 
* commit '7d657e5cfacec1f0be845c86dd4336e7efde5ede':
  Add mechanism for Parcel to not allow FDs to be written to it.
 2011-10-03 17:15:39 -07:00
Dianne Hackborn
9ecebbfbf7 Add mechanism for Parcel to not allow FDs to be written to it. 
This is to help implement issue #5224703.

Change-Id: I026a5890495537d15b57fe61227a640aac806d46
 2011-10-03 16:58:41 -07:00
Alon Albert
bf976ba657 Update dumpsys output 
After using the new format for a few days, I decided it's better to ahve the auth & acct
info on every row because we will sometimes grep the data and won't see it if the auth/acct
is ommited.

Also added the "time since last sync" to every row. This is also very useful.

Detailed Statistics (Recent history):  31 (# of times) 119s (sync time)
-------------------------------------------------------------------------------------
  subscribedfeeds                                             : 8/25%      17s/14%
    aagmtest2@gmail.com/com.google                            :   5/16%      16s/13%
    aagmtest1@gmail.com/com.google                            :   3/9%       1s/0%
-------------------------------------------------------------------------------------
  com.android.calendar                                        : 5/16%      10s/8%
    aagmtest2@gmail.com/com.google                            :   3/9%       0s/0%
    aagmtest1@gmail.com/com.google                            :   2/6%       9s/8%
-------------------------------------------------------------------------------------
  com.google.android.apps.books                               : 3/9%       26s/22%
-------------------------------------------------------------------------------------
  com.android.contacts                                        : 3/9%       14s/11%
    aagmtest1@gmail.com/com.google                            :   2/6%       9s/7%
    aagmtest2@gmail.com/com.google                            :   1/3%       5s/4%
-------------------------------------------------------------------------------------
  com.android.browser                                         : 3/9%       12s/10%
-------------------------------------------------------------------------------------
  com.google.android.music.MusicContent                       : 3/9%       7s/6%
-------------------------------------------------------------------------------------
  gmail-ls                                                    : 2/6%       12s/10%
-------------------------------------------------------------------------------------
  com.google.android.apps.plus.content.EsGooglePhotoProvider  : 2/6%       1s/0%
    aagmtest2@gmail.com/com.google                            :   1/3%       1s/0%
    aagmtest1@gmail.com/com.google                            :   1/3%       0s/0%
-------------------------------------------------------------------------------------
  com.google.android.apps.plus.content.EsProvider             : 1/3%       10s/9%
-------------------------------------------------------------------------------------
  com.google.android.gallery3d.GooglePhotoProvider            : 1/3%       5s/5%
-------------------------------------------------------------------------------------

Recent Sync History
  #1  : 2011-10-03 13:26:41   SERVER    0.0s            aagmtest2@gmail.com/com.google  com.android.calendar
  #2  : 2011-10-03 13:26:40    LOCAL    1.8s            aagmtest2@gmail.com/com.google  subscribedfeeds
  #3  : 2011-10-03 13:26:40    LOCAL    0.1s            aagmtest1@gmail.com/com.google  subscribedfeeds
  #4  : 2011-10-03 13:26:37   SERVER    0.1s         4  aagmtest2@gmail.com/com.google  com.android.calendar
  #5  : 2011-10-03 13:26:37    LOCAL    0.1s            aagmtest2@gmail.com/com.google  com.google.android.apps.books
  #6  : 2011-10-03 13:26:30   SERVER    0.9s         7  aagmtest2@gmail.com/com.google  com.google.android.apps.books
  #7  : 2011-10-03 13:26:25   SERVER    1.1s            aagmtest2@gmail.com/com.google  gmail-ls
  #8  : 2011-10-03 13:26:13   SERVER   11.8s        11  aagmtest2@gmail.com/com.google  gmail-ls
  #9  : 2011-10-03 13:26:08   SERVER    5.0s            aagmtest2@gmail.com/com.google  com.android.contacts
  #10 : 2011-10-03 13:26:08   SERVER    0.7s        29  aagmtest2@gmail.com/com.google  com.android.calendar
  #11 : 2011-10-03 13:26:07   SERVER    0.7s            aagmtest2@gmail.com/com.google  com.android.browser
  #12 : 2011-10-03 13:26:04   SERVER    3.0s         2  aagmtest2@gmail.com/com.google  com.android.browser
  #13 : 2011-10-03 13:26:04   SERVER   25.9s        25  aagmtest2@gmail.com/com.google  com.google.android.apps.books

Change-Id: I8da004f469d136fd9a86310b262eba61197fd0e7
 2011-10-03 15:16:20 -07:00
Mathew Inwood
e27d7e8630 am d0e8fb43: Merge "Document thrown IllegalArgumentException." 
* commit 'd0e8fb431ac9c1fcc2f5b0eba884d29fc57a4cf1':
  Document thrown IllegalArgumentException.
 2011-09-28 01:22:27 -07:00
Mathew Inwood
d0e8fb431a Merge "Document thrown IllegalArgumentException." 2011-09-28 01:20:04 -07:00
Alon Albert
98d35a217f am 553e5474: Merge "Add Detailed Sync Stats Section Also improve history formatting Here\'s a smaple of what it looks like:" 
* commit '553e54742043d9e7ee01d704390864ee554e8b09':
  Add Detailed Sync Stats Section Also improve history formatting Here's a smaple of what it looks like:
 2011-09-27 13:31:45 -07:00
Alon Albert
e0bde33e0d Add Detailed Sync Stats Section 
Also improve history formatting
Here's a smaple of what it looks like:

Detailed Statistics (Recent history):  20  40s
-------------------------------------------------------------------------------------
  com.android.contacts                                        : 9/45%      11/27%
    aagmtest1@gmail.com/com.google                            :   3/15%      4/11%
    aagmtest2@gmail.com/com.google                            :   3/15%      3/9%
    aalbert@google.com/com.google                             :   3/15%      2/6%
-------------------------------------------------------------------------------------
  gmail-ls                                                    : 6/30%      22/56%
-------------------------------------------------------------------------------------
  com.android.calendar                                        : 3/15%      5/14%
    aagmtest1@gmail.com/com.google                            :   1/5%       4/12%
    aagmtest2@gmail.com/com.google                            :   1/5%       0/0%
    aalbert@google.com/com.google                             :   1/5%       0/0%
-------------------------------------------------------------------------------------
  com.google.android.apps.plus.content.EsGooglePhotoProvider  : 2/10%      0/1%
    aagmtest1@gmail.com/com.google                            :   1/5%       0/1%
    aagmtest2@gmail.com/com.google                            :   1/5%       0/0%
-------------------------------------------------------------------------------------

Recent Sync History
  #1  : 2011-09-23 15:18:35   SERVER    0.8s  aalbert@google.com/com.google   gmail-ls
  #2  : 2011-09-23 15:17:56   SERVER    1.3s  00:38
  #3  : 2011-09-23 15:17:52   SERVER    4.6s  00:04
  #4  : 2011-09-23 15:17:45   SERVER    1.7s  00:06
  #5  : 2011-09-23 15:16:51    LOCAL    0.8s  aagmtest2@gmail.com/com.google  com.android.contacts
  #6  : 2011-09-23 15:16:51    LOCAL    0.7s  aalbert@google.com/com.google   com.android.contacts
  #7  : 2011-09-23 15:16:50    LOCAL    0.7s  aagmtest1@gmail.com/com.google  com.android.contacts
  #8  : 2011-09-23 15:15:35    LOCAL    0.7s  aalbert@google.com/com.google   com.android.contacts
  #9  : 2011-09-23 15:15:34    LOCAL    0.8s  aagmtest2@gmail.com/com.google  com.android.contacts
  #10 : 2011-09-23 15:15:33    LOCAL    1.9s  aagmtest1@gmail.com/com.google  com.android.contacts
  #11 : 2011-09-23 15:14:37    LOCAL    1.3s  aalbert@google.com/com.google   com.android.contacts
  #12 : 2011-09-23 15:14:35    LOCAL    2.0s  aagmtest1@gmail.com/com.google  com.android.contacts
  #13 : 2011-09-23 15:14:32    LOCAL    2.2s  aagmtest2@gmail.com/com.google  com.android.contacts
  #14 : 2011-09-23 15:13:41   SERVER    1.3s  aalbert@google.com/com.google   gmail-ls
  #15 : 2011-09-23 15:13:34    LOCAL    0.3s  aalbert@google.com/com.google   com.android.calendar
  #16 : 2011-09-23 15:13:34    LOCAL    0.4s  aagmtest2@gmail.com/com.google  com.android.calendar
  #17 : 2011-09-23 15:13:33   SERVER    0.1s  aagmtest2@gmail.com/com.google  com.google.android.apps.plus.content.EsGooglePhotoProvider
  #18 : 2011-09-23 15:13:33   SERVER    0.5s  aagmtest1@gmail.com/com.google  com.google.android.apps.plus.content.EsGooglePhotoProvider
  #19 : 2011-09-23 15:13:29    LOCAL    4.9s  aagmtest1@gmail.com/com.google  com.android.calendar
  #20 : 2011-09-23 15:13:28   SERVER   13.1s  aalbert@google.com/com.google   gmail-ls

Change-Id: Idc904e2e18a373b6d2d10af65b02683c11fd8d90
 2011-09-27 13:15:30 -07:00
Kenny Root
59ad0330ac am 8a663c89: Merge "Allow non-required package verifiers" 
* commit '8a663c89a3b5bda4e749a58d0434b130260eabb2':
  Allow non-required package verifiers
 2011-09-26 09:55:56 -07:00
Mathew Inwood
1b9f8d92a9 Document thrown IllegalArgumentException. 
Change-Id: I502f91e3c1130c14ad8f67934bf52a7206de302f
 2011-09-26 13:23:56 +01:00
Kenny Root
05ca4c9064 Allow non-required package verifiers 
* Verifiers can be specified in the AndroidManifest.xml

* Those verifiers can respond to the new Intent action

* PackageManager API for those verifiers: verifyPendingInstall

Change-Id: I4892bce2e6984871e6e93c60a1ca0dae145f5df5
 2011-09-23 16:03:03 -07:00
Dianne Hackborn
0ba3f30655 am a982ad19: Merge "Fix issue #5173952: Opening a Notification From Lock Screen..." 
* commit 'a982ad19d2aee54f714fa3ad9ee4ddbac08dc0fe':
  Fix issue #5173952: Opening a Notification From Lock Screen...
 2011-09-23 14:56:48 -07:00
Dianne Hackborn
a982ad19d2 Merge "Fix issue #5173952: Opening a Notification From Lock Screen..." 2011-09-23 14:54:26 -07:00
Scott Main
2d31058424 am c86bc42c: Merge "docs: a few additions and revisions to action bar docs" 
* commit 'c86bc42cb1b910c1150c8f5aa74c1c160c1359e3':
  docs: a few additions and revisions to action bar docs
 2011-09-23 14:07:14 -07:00
Dianne Hackborn
90c52de286 Fix issue #5173952: Opening a Notification From Lock Screen... 
...Should Skip Unsecure Lockscreen (ICS)

Also while I am in there, clean up logging of intent objects to include
even less sensitive information, while showing the true Intent in dump
output (since apps can't get to that).

Change-Id: I35fed714645b21e4304ba38a11ebb9c4c963538e
 2011-09-23 13:39:33 -07:00
Scott Main
e797ed6a74 docs: a few additions and revisions to action bar docs 
Change-Id: I12c24e5d4ed49d8f9822050d330f617bd614b7b9
 2011-09-23 12:56:20 -07:00
Kenny Root
d5ebd5694f am 0d3647dc: am 9c711282: Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom 
* commit '0d3647dc00849872ec5e18cce8ffe0e6ae02dd47':
  Unhide new PackageManager APIs for API 14
 2011-09-21 19:10:58 -07:00
Kenny Root
3a9b5fbb97 Unhide new PackageManager APIs for API 14 
Change-Id: I83110285ccee39a4cd872a1c2af8357f541833d4
 2011-09-20 14:35:10 -07:00
Kenny Root
c11bc8d224 Be more forgiving in parsing verifier IDs 
RFC 4648's Base32 is made to be forgiving for users doing manual entry
of the digits. For this reason we want to be able to parse lowercase
letters as uppercase and number 0 (zero) as letter O along with number
1 (one) as letter I.

Cherry-pick into ics-factoryrom

Change-Id: I149d8e947ff8b36305c1e61d8a1d80ff0b317cda
 2011-09-15 21:04:57 -07:00
Kenny Root
2a3f0d375a am 04b08bdf: Merge "Be more forgiving in parsing verifier IDs" 
* commit '04b08bdf19497c31abdef49100bfe471f8d104d6':
  Be more forgiving in parsing verifier IDs
 2011-09-15 09:34:28 -07:00
Kenny Root
a0f264e1af Be more forgiving in parsing verifier IDs 
RFC 4648's Base32 is made to be forgiving for users doing manual entry
of the digits. For this reason we want to be able to parse lowercase
letters as uppercase and number 0 (zero) as letter O along with number
1 (one) as letter I.

Change-Id: Ide760aff84f97c3e06af8bf8d006f36c74033a41
 2011-09-14 10:08:19 -07:00
Kenny Root
d5fcb0c2b5 am c924fbd6: Merge "Add verifier device identity" 
* commit 'c924fbd6933f6a96588b6e78d385082155cfd236':
  Add verifier device identity
 2011-09-13 18:28:15 -07:00
Kenny Root
c924fbd693 Merge "Add verifier device identity" 2011-09-13 17:51:08 -07:00
Irfan Sheriff
9c3e293f92 am 651cdfcb: Unhide wifi p2p API 
* commit '651cdfcbac6245f570475991588ddc2d30265e8d':
  Unhide wifi p2p API
 2011-09-13 16:09:14 -07:00
Irfan Sheriff
651cdfcbac Unhide wifi p2p API 
Bug: 5247957
Change-Id: Id93e30c0cb60f361ba13a840de8f843415777336
 2011-09-13 16:04:00 -07:00
Kenny Root
0aaa0d9317 Add verifier device identity 
This adds a special device identifier that is usable only for device
validation. The user will be presented with this number encoded in
easily-transcribable Base32 in the Developer options of Settings.

Change-Id: I4843f55ee90d689a51d0269b22454ca04c1be7ec
 2011-09-13 16:02:43 -07:00