39882 Commits

Author SHA1 Message Date
Maggie Benthall
c92342bb01 Merge "Add user restrictions for bluetooth, sideloading, usb file transfer" into jb-mr2-dev 2013-03-28 19:15:46 +00:00
Jeff Brown
0aba3b18a8 Merge "Support specifying buffer start offset for USB requests." into jb-mr2-dev 2013-03-28 18:53:33 +00:00
Robert Greenwalt
5acc8632a7 Merge "Add BT - DataTracker connection" into jb-mr2-dev 2013-03-28 16:45:33 +00:00
Wink Saville
224100f705 Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev 2013-03-28 16:09:26 +00:00
Jeff Brown
6c81a93ef3 Support specifying buffer start offset for USB requests.
Deprecated existing API which only supported passing buffer
and length in favor of a new one that also supports passing
the start.

Being able to pass a start index is very important because
the kernel imposes size limits on how much data can be transferred
at a time so we often need to transmit large buffers in chunks.

Change-Id: I3484b5e68f1ece61d4645ea04be8ee6a3b79169d
2013-03-28 03:13:09 -07:00
kmccormick
24b8947f62 resolved conflicts for merge of 603f987f to jb-mr2-dev
Change-Id: I4a130dad9d4669799f5d477f67e0f9a6a04381ca
2013-03-27 19:23:51 -07:00
kmccormick
603f987f14 am 418172bf: am 19840a8d: am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '418172bf8823016785526b433801d44a4630f276':
  Doc change: Fix typo DONT_DELTE
2013-03-27 18:59:42 -07:00
kmccormick
418172bf88 am 19840a8d: am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '19840a8d40139a12469ef92c3541f2a433d5ae85':
  Doc change: Fix typo DONT_DELTE
2013-03-27 18:57:27 -07:00
kmccormick
6e6e861a58 Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs 2013-03-28 01:49:37 +00:00
kmccormick
30498b4182 Doc change: Fix typo DONT_DELTE
"Bug: 8273156"

Change-Id: I6ba2e780d1a8c2b7d1771e93125a10b228227020
2013-03-27 17:56:13 -07:00
Nick Kralevich
98ea19ed24 Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev 2013-03-28 00:13:45 +00:00
Nick Kralevich
5992898755 Merge "Add buildPermissionRequestIntent to PackageManager" into jb-mr2-dev 2013-03-28 00:11:26 +00:00
Nick Kralevich
828c16f140 Reenable optional permissions parsing and expose APIs
Modify the package parsing code to understand optional permissions
(android:required="false"). This is essentially a rollback of
e824120016248bcfe3962883fe9f3b0481dd1c3d with some minor changes.

Expose the requestPermission API to third party apps. This allows
an app to request an Intent which, when passed to
startActivityForResult, will prompt the user to approve permissions
for an app.

In the event we decide to not launch with this feature, this change
can be rolled back.

Change-Id: Ie3626deae9b16e510323f94a2c80377f7c84b26f
2013-03-27 16:57:33 -07:00
Nick Kralevich
035f80d7c7 Add buildPermissionRequestIntent to PackageManager
Add the buildPermissionRequestIntent API to PackageManager. This allows
an app to request an Intent which, when passed to
startActivityForResult, will prompt the user to approve permissions
for an app.

Currently, the API is @hide.  It will be unhidden in a future change.

Change-Id: I4ec677002afa799a6eb5c2657c28452c91012436
2013-03-27 16:55:27 -07:00
Dianne Hackborn
bf20aa767e Merge "Keep track of who has disabled applications." into jb-mr2-dev 2013-03-27 23:32:36 +00:00
Wink Saville
15bc62fe20 Cleanup some debug in LinkCapabilities and Properties.
Change-Id: I5fe0124d0943f5e538e451645f32533a74c75a47
2013-03-27 16:21:43 -07:00
Robert Greenwalt
665e1aed5e Add BT - DataTracker connection
Allows the external BT stack the means to communicate with
ConnectivityService during reverse tethering.

bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
2013-03-27 15:45:12 -07:00
Fabrice Di Meglio
f7fa08b702 Merge "Fix bug #8487785 Notification shade has text overlapping the icon" into jb-mr2-dev 2013-03-27 22:15:59 +00:00
Maggie Benthall
a12fccf57d Add user restrictions for bluetooth, sideloading, usb file transfer
Created constants for these in UserManager and current.txt. Also created
an accessor for individual user restrictions that takes the restriction key
(removing individual methods for particular restrictions).

Change-Id: Ibb5517cbcdffadd3925f52cbe67d7d525813faa9
2013-03-27 18:14:29 -04:00
Fabrice Di Meglio
02a7d5637c Fix bug #8487785 Notification shade has text overlapping the icon
- follow up to the fix for bug #8480245 ViewGroup layout margins can be wrong in RTL mode
- deal with "RTL compatibility mode": if left/right margins are not defined and if we
haev some start/end ones then use the start/end ones.

Change-Id: I98fe3276de2bd14f60a1c423a47569a68046f7be
2013-03-27 15:12:06 -07:00
Lorenzo Colitti
cdee9727e2 Merge "Make isHostRoute match only host routes" into jb-mr2-dev 2013-03-27 21:59:10 +00:00
Jeff Brown
44bed6af1d Merge "Disable some noisy error logs." into jb-mr2-dev 2013-03-27 21:57:33 +00:00
Jeff Brown
44e13ef1a1 Disable some noisy error logs.
Disabled some error logs that occur when an input channel is
closed remotely by its peer.  These can happen during normal
course of operations because the act of removing windows or
finishing IME sessions is asynchronous so both peers may react
to the change independently at different times.

The coordination with the input dispatcher is designed to
avoid logging these errors.  However it's not possible to achieve
the same coordination with the IME so we might as well silence
the errors since they don't tell us anything useful.

If something truly bad happens then one of two things will occur:

1. The system will realize that the process crashed because
   of a DeadObjectException or other error, so it will take
   measures to clean up.

2. If the error was spurious and non-fatal (how?) then at worst
   an ANR may occur because the consumer stopped reading from
   the input channel.  However this has never been observed
   and I doubt it's even possible.

Change-Id: I11a05d6d75e63e91be003971a544069b3a0d77f4
2013-03-27 12:34:30 -07:00
Yorke Lee
2e73f5b8b7 Merge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev 2013-03-27 19:14:09 +00:00
Yorke Lee
0dc523fa99 Expose data_usage_stat table in ContactsContract
Bug: 8124079
Change-Id: Ie60e489f08be270b9f3a4866c488a5e0598ceb26
2013-03-27 12:07:52 -07:00
Dianne Hackborn
3fa3c28a35 Keep track of who has disabled applications.
Change-Id: I2640d3dc2200b589e2beb42a43cc93efd090f06e
2013-03-27 12:01:52 -07:00
Dianne Hackborn
174d90787c am bfd15fa0: am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."
* commit 'bfd15fa00557ea78567a30fe260dea62c37bd5a0':
  Two REMOVE_PROVIDER messages caused by race condition.
2013-03-27 11:37:08 -07:00
Chiao Cheng
972a9255a7 Merge "Allow leading slash in path argument for addURI() method." into jb-mr2-dev 2013-03-27 17:18:30 +00:00
Yorke Lee
038fbc5d09 Merge "Add new apis to CP2" into jb-mr2-dev 2013-03-27 16:43:41 +00:00
Baligh Uddin
993f10af84 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-27 16:38:07 +00:00
Nick Kralevich
4b2548815d Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev 2013-03-27 16:20:26 +00:00
Martijn Coenen
d9f0180ab8 Merge "Add direct NDEF push API." into jb-mr2-dev 2013-03-27 16:04:47 +00:00
Baligh Uddin
dee11a5496 Import translations. DO NOT MERGE
Change-Id: I3115e513480f3a73084de898943db307a5294a08
Auto-generated-cl: translation import
2013-03-27 08:35:28 -07:00
Lorenzo Colitti
fdadc4e242 Make isHostRoute match only host routes
Currently, isHostRoute returns true iff the gateway address is
the unspecified address (0.0.0.0 or ::). Thus, it will return
true for any route that has no gateway (e.g., a route pointing at
a point-to-point interface), even if the route is not a host
route.

Fix this by checking the prefix length instead. This should be
safe because:

1. mDestination cannot be null, since it's created using new.
2. Host routes created using makeHostRoute (which is what
   ConnectivityService calls) always have the correct prefix
   lengths (/32 or /128) set.

Bug: 8276725
Change-Id: I14285398823fa6c312349128c7cc216cad4a84c9
2013-03-27 19:41:06 +09:00
Jeff Sharkey
7cd9ed195b Merge "Benchmarks for IndentingPrintWriter." into jb-mr2-dev 2013-03-27 03:18:06 +00:00
Jeff Sharkey
8fa9bb5210 Benchmarks for IndentingPrintWriter.
Current timings on a mako listed below, which show minimal overhead
compared to writing directly. The increased code readability and
automatic indenting is worth the overhead.

Also worth noting is that writing concatenated strings is
substantially faster than printing components separately.

           benchmark      us linear runtime
       ComplexDirect 10712.7 =========================
    ComplexIndenting 12623.7 ==============================
       PairIndenting    45.8 =
             PairRaw    82.1 =
        SimpleDirect   282.2 =
     SimpleIndenting   294.4 =

Change-Id: I7c38690c14b017fa46248ebb0be69f6beff03371
2013-03-26 20:16:44 -07:00
Jeff Brown
ca3d655d20 Merge "Use input transport for communications between app and IME." into jb-mr2-dev 2013-03-27 02:43:54 +00:00
Dianne Hackborn
bfd15fa005 am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."
* commit '6b96e2f0006b5c33973b3500d3bb72a8c7a3bd38':
  Two REMOVE_PROVIDER messages caused by race condition.
2013-03-26 17:46:21 -07:00
Fabrice Di Meglio
a803b094c6 Merge "Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode" into jb-mr2-dev 2013-03-27 00:44:48 +00:00
Fabrice Di Meglio
0072f64939 Fix bug #8480245 ViewGroup layout margins can be wrong in RTL mode
- fix resolution of MarginLayoutParams
- update related RelativeLayout code

Change-Id: I261f127a8897f60d316fed2a73e6e76020e542cc
2013-03-26 17:27:33 -07:00
Dianne Hackborn
3bcc2fbaad Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev 2013-03-27 00:24:04 +00:00
Dianne Hackborn
5871b258af Merge "Change wm commands to return size and density info." into jb-mr2-dev 2013-03-27 00:22:28 +00:00
Romain Guy
2509437e30 Merge "Avoid multiple font cache texture uploads Bug #8378964" into jb-mr2-dev 2013-03-27 00:21:05 +00:00
Nick Kralevich
7a8c135177 AppSecurityPermissions: Add isGranted to isDisplayablePermission
Modify isDisplayablePermission to display a permission if the
app update will grant a new optional permission to the app.

Change-Id: Ic647826b0c48f9f7ec8e4f69b90197211f83278d
2013-03-26 17:18:32 -07:00
Guobin Zhang
9e3e526650 Two REMOVE_PROVIDER messages caused by race condition.
Fix a bug in unstable ContentProvider.
IllegalStateException: ref counts can't go to zero here: stable=0 unstable=0
IllegalStateException: unstable count < 0: -1

There is a race between main thread and background database thread. Main thread
is responsible for handling the REMOVE_PROVIDER message. Database thread starts
insert or query request again and again. acquireProvider in db thread will often
snatch provider from the jaws of death, sometime it fails to remove REMOVE_PROVIDER
which is already fired out from MessageQueue. But completeRemoveProvider in main
thread gets suspended when trying to execute the critical section. If db thread
released the provider before main thread resumes the execution, then two
REMOVE_PROVIDER messages will be executed.

Change-Id: I8588aa1d1a8bc444dcd2adf6f8bc3f055cebbdc4
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
2013-03-27 00:17:27 +00:00
Martijn Coenen
1fa2aff21b Add direct NDEF push API.
Hidden for now. Also, modified callback that is called
from NfcService to pass all data in a single object
(BeamShareData). This avoids having to do multiple IPCs
at touch time.

Bug: 5134061
Change-Id: I235f608cef9935041b33b4b7a6980f109c15576c
2013-03-26 17:07:37 -07:00
Elliott Hughes
827181538c am 6f14ef70: am 083bfa5a: Merge "Remove dead DateUtils code that was never in an API level."
* commit '6f14ef70664d13295ffca524fb0b08365351b1f7':
  Remove dead DateUtils code that was never in an API level.
2013-03-26 16:51:10 -07:00
Amith Yamasani
e450c3cd8d Merge "Fix docs build." into jb-mr2-dev 2013-03-26 23:23:32 +00:00
Amith Yamasani
ca050adc13 Fix docs build.
Change-Id: I959db164f0ed7badfcdf921ffa1bfff60b4fb952
2013-03-26 16:19:46 -07:00
Michael Wright
cf797a5e43 Merge "Deliver key repeats for artificial dpad events" into jb-mr2-dev 2013-03-26 23:11:15 +00:00