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

102572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
e536ba7ecb am 59928987: Merge "Add buildPermissionRequestIntent to PackageManager" into jb-mr2-dev 
* commit '5992898755dc60d2d220a0870f76cf4f1fb27ed8':
  Add buildPermissionRequestIntent to PackageManager
 2013-03-27 17:14:49 -07:00
Nick Kralevich
5992898755 Merge "Add buildPermissionRequestIntent to PackageManager" into jb-mr2-dev 2013-03-28 00:11:26 +00: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
6b8e7b35ef am bf20aa76: Merge "Keep track of who has disabled applications." into jb-mr2-dev 
* commit 'bf20aa767e7a56b3c1e05c6d2a8b140fd1c18dd0':
  Keep track of who has disabled applications.
 2013-03-27 16:37:25 -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
Fabrice Di Meglio
9fb9a0f3b8 am f7fa08b7: Merge "Fix bug #8487785 Notification shade has text overlapping the icon" into jb-mr2-dev 
* commit 'f7fa08b7024fa91001080a766cd9ac8eab82d634':
  Fix bug #8487785 Notification shade has text overlapping the icon
 2013-03-27 15:18:34 -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
Irfan Sheriff
edca04a80f am c75195ae: Merge "Notify user only when device provisioned" into jb-mr2-dev 
* commit 'c75195ae4b83c18ad330c486d50c3217881fddff':
  Notify user only when device provisioned
 2013-03-27 15:15:04 -07:00
Irfan Sheriff
c75195ae4b Merge "Notify user only when device provisioned" into jb-mr2-dev 2013-03-27 22:12:20 +00: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
Adam Powell
3f1be07f0a am 6ceed12a: Merge "Fix an action bar menu order of operations bug" into jb-mr2-dev 
* commit '6ceed12a6ccbbd348849c83b5e810b6325dad994':
  Fix an action bar menu order of operations bug
 2013-03-27 15:11:33 -07:00
Adam Powell
6ceed12a6c Merge "Fix an action bar menu order of operations bug" into jb-mr2-dev 2013-03-27 22:07:18 +00:00
Lorenzo Colitti
f513cb3827 am cdee9727: Merge "Make isHostRoute match only host routes" into jb-mr2-dev 
* commit 'cdee9727e26721910a44ba67980b39de4b103f7d':
  Make isHostRoute match only host routes
 2013-03-27 15:04:42 -07:00
Jeff Brown
1d4d4099c1 am 44bed6af: Merge "Disable some noisy error logs." into jb-mr2-dev 
* commit '44bed6af1d40e529b51d992507d7dd3370abf262':
  Disable some noisy error logs.
 2013-03-27 15:01: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 Sharkey
23ebef61c1 am dde86613: Merge "Sync APIs use seconds instead of ms." into jb-mr2-dev 
* commit 'dde866131793208bbaabf29c4ed2e2a48d9eed95':
  Sync APIs use seconds instead of ms.
 2013-03-27 14:51:57 -07:00
Jeff Sharkey
dde8661317 Merge "Sync APIs use seconds instead of ms." into jb-mr2-dev 2013-03-27 21:48:43 +00:00
Jeff Sharkey
51366be80f Sync APIs use seconds instead of ms. 
Bug: 7668972
Change-Id: I7b253fe17d9539695adc474a69546645586b5f1a
 2013-03-27 14:46:55 -07:00
Irfan Sheriff
07a2295a4d Notify user only when device provisioned 
Make sure the notification about scan mode being availabe is only shown
when device is already provisioned

Bug: 8482739
Change-Id: If8a76ffcc0401b846e39b02a55ea69743303c93d
 2013-03-27 14:40:46 -07:00
Tim Murray
25440d39ed am 8ff0201a: Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev 
* commit '8ff0201ad0354b6c43aebac6075298ee847c42ef':
  Revert "Remove all public mention of RS graphics from docs."
 2013-03-27 14:35:16 -07:00
Tim Murray
8ff0201ad0 Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev 2013-03-27 21:32:31 +00:00
Tim Murray
275812c2bb Revert "Remove all public mention of RS graphics from docs." 
This reverts commit d72f932b8cbf461ebb79c249ce92b9b811122190

Change-Id: I056b13d0b2beb508e4215bc0d289cf3e76a3a986
 2013-03-27 21:31:28 +00:00
Tim Murray
0e39ae1073 am 8565520b: Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev 
* commit '8565520b85bd42bc57adc551c4a72bc3f5b0025a':
  Remove all public mention of RS graphics from docs.
 2013-03-27 14:06:25 -07:00
Tim Murray
8565520b85 Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev 2013-03-27 21:01:37 +00:00
Chris Craik
ed8f6aec85 am 9cd64512: Merge "Set ignore flag during deferred savelayer" into jb-mr2-dev 
* commit '9cd645121584bc167b3fab61b1ed89ddc4631365':
  Set ignore flag during deferred savelayer
 2013-03-27 12:51:03 -07:00
Chris Craik
9cd6451215 Merge "Set ignore flag during deferred savelayer" into jb-mr2-dev 2013-03-27 19:47:59 +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
Adam Powell
5c8f9b50be Fix an action bar menu order of operations bug 
As options menu invalidations in PhoneWindow are deferred, it was
possible for a call to open the overflow menu (which involves an extra
chance to prepare the menu) to happen before the pending menu
invalidation was handled. Process any pending menu invalidations
before attempting to show the overflow menu in response to one of
these events.

Bug 7209308

Change-Id: Id50f7f6ad5d3a631745207fa0bad8c356690e16c
 2013-03-27 12:24:58 -07:00
Yorke Lee
7b1948b3b9 am 2e73f5b8: Merge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev 
* commit '2e73f5b8b7c941e68fec2d763d9455a8d6190e25':
  Expose data_usage_stat table in ContactsContract
 2013-03-27 12:16:57 -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
084e6496b3 am 174d9078: am bfd15fa0: am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition." 
* commit '174d90787c31027d98ad62c0c31e94910ee61b10':
  Two REMOVE_PROVIDER messages caused by race condition.
 2013-03-27 11:38:35 -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
Jean-Michel Trivi
455547795c am f2b0fdb2: Merge "AudioEffect types in SDK" into jb-mr2-dev 
* commit 'f2b0fdb2f7d701355d3fdb7b9a7780387cbf0e46':
  AudioEffect types in SDK
 2013-03-27 10:38:58 -07:00
Chris Craik
408eb12631 Set ignore flag during deferred savelayer 
bug:8471552

Additionally, add ignore check for draw functor

In deferred mode, if we don't set ignore, a 0 alpha displayList won't
be quickRejected, and not only would its contents be needlessly
deferred, but upon playback any functors would be drawn, ignoring the
state of the snapshot.

Change-Id: Ib1edb3252080f674254086edee6f965f0efcce78
 2013-03-27 10:38:36 -07:00
Jean-Michel Trivi
f2b0fdb2f7 Merge "AudioEffect types in SDK" into jb-mr2-dev 2013-03-27 17:35:44 +00:00
Chiao Cheng
efb7a924f9 am 972a9255: Merge "Allow leading slash in path argument for addURI() method." into jb-mr2-dev 
* commit '972a9255a7e2c75cf13dab74121cb367c03e2809':
  Allow leading slash in path argument for addURI() method.
 2013-03-27 10:21:06 -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
Jean-Michel Trivi
80569f7ff7 AudioEffect types in SDK 
Not all effect types are defined by OpenSL ES. Add the full UUID
 effect identifier in the superclass of all audio effects.

bug 8113082

Change-Id: I8dfc6cdcfd2a145e792fb3669e6132e6f19d1c16
 2013-03-27 09:59:24 -07:00
Yorke Lee
6b141509ea am 038fbc5d: Merge "Add new apis to CP2" into jb-mr2-dev 
* commit '038fbc5d099c6fb8903ccc00c0988d482bfb8046':
  Add new apis to CP2
 2013-03-27 09:48:26 -07:00
Yorke Lee
038fbc5d09 Merge "Add new apis to CP2" into jb-mr2-dev 2013-03-27 16:43:41 +00:00
Baligh Uddin
c5ff3ef46c am 993f10af: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '993f10af84768bc37dac211efe3133257680f2d1':
  Import translations. DO NOT MERGE
 2013-03-27 09:41:40 -07:00
Baligh Uddin
993f10af84 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-27 16:38:07 +00:00
Nick Kralevich
7306da9075 am 4b254881: Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev 
* commit '4b2548815df45b3aa6a8144abeeaea504ee6f7b1':
  AppSecurityPermissions: Add isGranted to isDisplayablePermission
 2013-03-27 09:23:01 -07:00
Nick Kralevich
4b2548815d Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev 2013-03-27 16:20:26 +00:00
Martijn Coenen
511d33bb5b am d9f0180a: Merge "Add direct NDEF push API." into jb-mr2-dev 
* commit 'd9f0180ab8bb4c69dcf1535c3dfe0d8c464a7377':
  Add direct NDEF push API.
 2013-03-27 09:07:29 -07: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