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

103242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
faa262cb10 am 960650c6: am 7ba6470f: am 4224a4ca: am 3864aa39: Merge "Add interrupter library to simulate EINTR" 
* commit '960650c6e3504c85f9e22210621f0317880f723b':
  Add interrupter library to simulate EINTR
 2013-03-27 17:51:11 -07:00
Kenny Root
960650c6e3 am 7ba6470f: am 4224a4ca: am 3864aa39: Merge "Add interrupter library to simulate EINTR" 
* commit '7ba6470f4a734f4dc7255d484566ca84b269b0ae':
  Add interrupter library to simulate EINTR
 2013-03-27 17:48:22 -07:00
Kenny Root
7ba6470f4a am 4224a4ca: am 3864aa39: Merge "Add interrupter library to simulate EINTR" 
* commit '4224a4ca85a4e7ba3f4e543ee52c643405464164':
  Add interrupter library to simulate EINTR
 2013-03-27 17:45:21 -07:00
Kenny Root
4224a4ca85 am 3864aa39: Merge "Add interrupter library to simulate EINTR" 
* commit '3864aa3944254184ddcd61002cb9f1d7cb1d4c67':
  Add interrupter library to simulate EINTR
 2013-03-27 17:42:36 -07:00
Dianne Hackborn
6e2d7406f6 am f9bfdfd7: am a6470d45: Merge "Fix build." into jb-mr2-dev 
* commit 'f9bfdfd752fd777c321eb5fb8922571cf1b52196':
  Fix build.
 2013-03-27 17:28:16 -07:00
Nick Kralevich
adb2578a05 am 96e44a2c: am 98ea19ed: Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev 
* commit '96e44a2c2ce0579177c50a4fb710adc83530e968':
  Reenable optional permissions parsing and expose APIs
 2013-03-27 17:24:15 -07:00
Dianne Hackborn
f9bfdfd752 am a6470d45: Merge "Fix build." into jb-mr2-dev 
* commit 'a6470d45148beaed765b88068bc76ad652ef33de':
  Fix build.
 2013-03-27 17:22:54 -07:00
Nick Kralevich
0655ade016 am e536ba7e: am 59928987: Merge "Add buildPermissionRequestIntent to PackageManager" into jb-mr2-dev 
* commit 'e536ba7ecbb609ec9ada1bf39455ca0ba94163f6':
  Add buildPermissionRequestIntent to PackageManager
 2013-03-27 17:20:32 -07:00
Dianne Hackborn
a6470d4514 Merge "Fix build." into jb-mr2-dev 2013-03-28 00:20:27 +00:00
Dianne Hackborn
7039738f81 Fix build. 
Change-Id: I38a25dc63107fc907a520169e1b58f00e51dbb9d
 2013-03-27 17:19:35 -07:00
Nick Kralevich
96e44a2c2c am 98ea19ed: Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev 
* commit '98ea19ed247b9a2e598e2b66b84806313884a4d3':
  Reenable optional permissions parsing and expose APIs
 2013-03-27 17:18:55 -07:00
Kenny Root
3864aa3944 Merge "Add interrupter library to simulate EINTR" 2013-03-28 00:16:31 +00:00
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
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
d734b4f285 am 6b8e7b35: am bf20aa76: Merge "Keep track of who has disabled applications." into jb-mr2-dev 
* commit '6b8e7b35ef763d29a30c87a5a95ef941d39a8ee9':
  Keep track of who has disabled applications.
 2013-03-27 16:40:49 -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
97207ab966 am 9fb9a0f3: am f7fa08b7: Merge "Fix bug #8487785 Notification shade has text overlapping the icon" into jb-mr2-dev 
* commit '9fb9a0f3b8c22ca538a36b81769c7e1080fcf9f9':
  Fix bug #8487785 Notification shade has text overlapping the icon
 2013-03-27 15:21:46 -07: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
Irfan Sheriff
028335f93a am edca04a8: am c75195ae: Merge "Notify user only when device provisioned" into jb-mr2-dev 
* commit 'edca04a80f9c6608b0bcf044da32d78668a289b9':
  Notify user only when device provisioned
 2013-03-27 15:18:21 -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
Adam Powell
63073b7272 am 3f1be07f: am 6ceed12a: Merge "Fix an action bar menu order of operations bug" into jb-mr2-dev 
* commit '3f1be07f0a4183ae5e48a4a33f32ed1af949b7ae':
  Fix an action bar menu order of operations bug
 2013-03-27 15:14:48 -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
Lorenzo Colitti
95c8c55ded am f513cb38: am cdee9727: Merge "Make isHostRoute match only host routes" into jb-mr2-dev 
* commit 'f513cb3827ec55cb6e6a2f068459d3c784f68d60':
  Make isHostRoute match only host routes
 2013-03-27 15:07:52 -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
954aa17904 am 1d4d4099: am 44bed6af: Merge "Disable some noisy error logs." into jb-mr2-dev 
* commit '1d4d4099c161c526ab316f7528bc7737884efb74':
  Disable some noisy error logs.
 2013-03-27 15:04:20 -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
7dc0a8e10b am 23ebef61: am dde86613: Merge "Sync APIs use seconds instead of ms." into jb-mr2-dev 
* commit '23ebef61c1d7d62edd65d105cc5c2f0b728b1e53':
  Sync APIs use seconds instead of ms.
 2013-03-27 14:53:49 -07: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
da13653964 am 25440d39: am 8ff0201a: Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev 
* commit '25440d39ed679c33303fc23ada0b862fda4d5444':
  Revert "Remove all public mention of RS graphics from docs."
 2013-03-27 14:37:07 -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
40f897a312 am 0e39ae10: am 8565520b: Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev 
* commit '0e39ae1073c38afbce02f8470dcc717fd91f9751':
  Remove all public mention of RS graphics from docs.
 2013-03-27 14:08:18 -07: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
741a0da166 am ed8f6aec: am 9cd64512: Merge "Set ignore flag during deferred savelayer" into jb-mr2-dev 
* commit 'ed8f6aec85faa336add25a9e1f33cee0d66e47ef':
  Set ignore flag during deferred savelayer
 2013-03-27 12:52:43 -07: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