OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 7e89a40c: am e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update Choose...
Adam Powell [Fri, 17 Jul 2015 01:31:37 +0000 (01:31 +0000)]
am 7e89a40c: am e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev

* commit '7e89a40c2e6a9adad41724c0db0019e2d48fde03':
  Update ChooserTarget constructor to take ComponentName, Bundle

9 years agoam e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget const...
Adam Powell [Fri, 17 Jul 2015 01:17:25 +0000 (01:17 +0000)]
am e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev

* commit 'e0968e14e46c941434f28ec633473d49b9583bf9':
  Update ChooserTarget constructor to take ComponentName, Bundle

9 years agoam b9587956: am 1d75ba1b: am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve docum...
Svet Ganov [Fri, 17 Jul 2015 01:14:00 +0000 (01:14 +0000)]
am b9587956: am 1d75ba1b: am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev

* commit 'b9587956754a84015d5e80021379265f9a4a7bb0':
  Improve documentation of onRequestPermissionsResult

9 years agoam cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to...
Adam Powell [Fri, 17 Jul 2015 01:03:18 +0000 (01:03 +0000)]
am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev

* commit 'cb29a8a17a6634ad8b3010bfd4d47eca0f305d96':
  Update ChooserTarget constructor to take ComponentName, Bundle

9 years agoam 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentNa...
Adam Powell [Fri, 17 Jul 2015 00:50:06 +0000 (00:50 +0000)]
am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev

* commit '2fca4812336476e7c000214109b6c06b401986c2':
  Update ChooserTarget constructor to take ComponentName, Bundle

9 years agoam 1d75ba1b: am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation...
Svet Ganov [Fri, 17 Jul 2015 00:49:55 +0000 (00:49 +0000)]
am 1d75ba1b: am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev

* commit '1d75ba1bce3a69cc6b5fa018f64e0ef7e67f3e2f':
  Improve documentation of onRequestPermissionsResult

9 years agoam 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle...
Adam Powell [Fri, 17 Jul 2015 00:32:58 +0000 (00:32 +0000)]
am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev

* commit '9ba039bbe9478c56ae3875a9933d3ba754367dc2':
  Update ChooserTarget constructor to take ComponentName, Bundle

9 years agoam 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermi...
Svet Ganov [Fri, 17 Jul 2015 00:32:19 +0000 (00:32 +0000)]
am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev

* commit '69fd08a0900a75a4ba31fdb51a7688e0eb0c70e1':
  Improve documentation of onRequestPermissionsResult

9 years agoMerge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev
Adam Powell [Fri, 17 Jul 2015 00:25:09 +0000 (00:25 +0000)]
Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev

9 years agoMerge "Remove ImageViewBitmapDrawable class"
Chris Craik [Fri, 17 Jul 2015 00:21:23 +0000 (00:21 +0000)]
Merge "Remove ImageViewBitmapDrawable class"

9 years agoam b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult...
Svet Ganov [Fri, 17 Jul 2015 00:19:30 +0000 (00:19 +0000)]
am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev

* commit 'b0f8fee845fa2e41ea1e003e413c3df59d641137':
  Improve documentation of onRequestPermissionsResult

9 years agoam 37c84977: am 5e2b80bb: am 9f8a74e8: am 59267618: am 5aff3b54: Merge "Maintain...
Roshan Pius [Fri, 17 Jul 2015 00:13:29 +0000 (00:13 +0000)]
am 37c84977: am 5e2b80bb: am 9f8a74e8: am 59267618: am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev

* commit '37c84977cee4ffd64ad97c6c691b73abcc0740df':
  Maintain call time across SRVCC (2/3).

9 years agoam 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
Svet Ganov [Fri, 17 Jul 2015 00:03:30 +0000 (00:03 +0000)]
am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev

* commit '6f561a24c97d25a858cf98eef5c502ef8d80cfc1':
  Improve documentation of onRequestPermissionsResult

9 years agoam 5e2b80bb: am 9f8a74e8: am 59267618: am 5aff3b54: Merge "Maintain call time across...
Roshan Pius [Thu, 16 Jul 2015 23:58:56 +0000 (23:58 +0000)]
am 5e2b80bb: am 9f8a74e8: am 59267618: am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev

* commit '5e2b80bb61a9c02153c554642ab6334f8ffd4518':
  Maintain call time across SRVCC (2/3).

9 years agoMerge "Improve documentation of onRequestPermissionsResult" into mnc-dev
Svet Ganov [Thu, 16 Jul 2015 23:51:50 +0000 (23:51 +0000)]
Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev

9 years agoam ccada9ab: am 6f1d0d13: am 174da4e3: am e8ce2144: am f7592b23: Merge "HMAC keys...
Alex Klyubin [Thu, 16 Jul 2015 23:50:26 +0000 (23:50 +0000)]
am ccada9ab: am 6f1d0d13: am 174da4e3: am e8ce2144: am f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev

* commit 'ccada9abada9f77971f9dea5cdccba6a0fd23e7d':
  HMAC keys are authorized for exactly one digest.

9 years agoam 9f8a74e8: am 59267618: am 5aff3b54: Merge "Maintain call time across SRVCC (2...
Roshan Pius [Thu, 16 Jul 2015 23:43:21 +0000 (23:43 +0000)]
am 9f8a74e8: am 59267618: am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev

* commit '9f8a74e8fbcef125208a3ef2e514d474e1d8593f':
  Maintain call time across SRVCC (2/3).

9 years agoam 6f1d0d13: am 174da4e3: am e8ce2144: am f7592b23: Merge "HMAC keys are authorized...
Alex Klyubin [Thu, 16 Jul 2015 23:37:12 +0000 (23:37 +0000)]
am 6f1d0d13: am 174da4e3: am e8ce2144: am f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev

* commit '6f1d0d133b7bb9dc94412d519d00bfa3824c286e':
  HMAC keys are authorized for exactly one digest.

9 years agoUpdate ChooserTarget constructor to take ComponentName, Bundle
Adam Powell [Thu, 16 Jul 2015 03:14:57 +0000 (20:14 -0700)]
Update ChooserTarget constructor to take ComponentName, Bundle

Simplify ChooserTarget handling by requiring a target component and an
extras bundle instead of a full PendingIntent/IntentSender. This
simplifies the handling of URI grants from sending apps.

Prune ChooserTargets that point at ComponentNames that don't share a
package with the original matching Activity target or that aren't
exported so that we don't show the user something they can't launch.

Bug 22516282

Change-Id: I3439c0910b4fa4f95c7a881b529942c96ffc953e

9 years agoam 59267618: am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev
Roshan Pius [Thu, 16 Jul 2015 23:29:31 +0000 (23:29 +0000)]
am 59267618: am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev

* commit '5926761865fe3ea484e02ad2dcf87b72b36ce4f3':
  Maintain call time across SRVCC (2/3).

9 years agoImprove documentation of onRequestPermissionsResult
Svet Ganov [Thu, 16 Jul 2015 23:28:51 +0000 (16:28 -0700)]
Improve documentation of onRequestPermissionsResult

bug:22524902

Change-Id: Ic435171fa016d8841bea432c5c39d7b0a6a7b9e9

9 years agoam 174da4e3: am e8ce2144: am f7592b23: Merge "HMAC keys are authorized for exactly...
Alex Klyubin [Thu, 16 Jul 2015 23:20:57 +0000 (23:20 +0000)]
am 174da4e3: am e8ce2144: am f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev

* commit '174da4e3515b1262140392402be69cb41eefd0ab':
  HMAC keys are authorized for exactly one digest.

9 years agoam 71d12704: am 475858c3: am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs...
Svet Ganov [Thu, 16 Jul 2015 23:20:46 +0000 (23:20 +0000)]
am 71d12704: am 475858c3: am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

* commit '71d12704f64eeace695a6b8e0cd8f36007b96270':
  Add APIs for verifier to grant at install and revoke permissions

9 years agoam 8f587bfb: am 4c935068: am 41b43d7c: am 7b0fa466: am 0f724601: Merge "Fix clip...
Chris Craik [Thu, 16 Jul 2015 23:20:39 +0000 (23:20 +0000)]
am 8f587bfb: am 4c935068: am 41b43d7c: am 7b0fa466: am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev

* commit '8f587bfb05c0db2d48692c9701ac2d97e43acdc1':
  Fix clip area behavior for REPLACE op

9 years agoam 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev
Roshan Pius [Thu, 16 Jul 2015 23:19:17 +0000 (23:19 +0000)]
am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev

* commit '5aff3b5489262ccff4b6f9e18e0d990ebfe4d7bc':
  Maintain call time across SRVCC (2/3).

9 years agoMerge "Maintain call time across SRVCC (2/3)." into mnc-dev
Roshan Pius [Thu, 16 Jul 2015 23:09:14 +0000 (23:09 +0000)]
Merge "Maintain call time across SRVCC (2/3)." into mnc-dev

9 years agoam 475858c3: am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier...
Svet Ganov [Thu, 16 Jul 2015 23:05:41 +0000 (23:05 +0000)]
am 475858c3: am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

* commit '475858c34d21b38d9be4356a7fc654eb879e34b5':
  Add APIs for verifier to grant at install and revoke permissions

9 years agoam 4c935068: am 41b43d7c: am 7b0fa466: am 0f724601: Merge "Fix clip area behavior...
Chris Craik [Thu, 16 Jul 2015 23:05:36 +0000 (23:05 +0000)]
am 4c935068: am 41b43d7c: am 7b0fa466: am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev

* commit '4c93506881fa710d69557a592f3fc7759b3ec9c4':
  Fix clip area behavior for REPLACE op

9 years agoam e8ce2144: am f7592b23: Merge "HMAC keys are authorized for exactly one digest...
Alex Klyubin [Thu, 16 Jul 2015 23:05:27 +0000 (23:05 +0000)]
am e8ce2144: am f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev

* commit 'e8ce21448297d7460eb8f4ef91b4f636946abce8':
  HMAC keys are authorized for exactly one digest.

9 years agoam ee924ded: am 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue...
Dianne Hackborn [Thu, 16 Jul 2015 22:53:32 +0000 (22:53 +0000)]
am ee924ded: am 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev

* commit 'ee924dedcc36d64a72652bb3e5fb64d5d5c4c6a4':
  Work on issue #22516282: ChooserTarget URI grants not forwarded

9 years agoam e7cc39a3: am 41bb77bd: am ebb56d9b: am 550f1d4e: Merge "Delete overscan setting...
Filip Gruszczynski [Thu, 16 Jul 2015 22:53:25 +0000 (22:53 +0000)]
am e7cc39a3: am 41bb77bd: am ebb56d9b: am 550f1d4e: Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev

* commit 'e7cc39a399fa6362d1062ab3e57f9cf40ec76279':
  Delete overscan setting by both unique id and name.

9 years agoMerge "That is not yellow"
Chris Craik [Thu, 16 Jul 2015 22:52:47 +0000 (22:52 +0000)]
Merge "That is not yellow"

9 years agoam b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at insta...
Svet Ganov [Thu, 16 Jul 2015 22:50:23 +0000 (22:50 +0000)]
am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

* commit 'b295963baebac1b70ca701a50c77a83659963608':
  Add APIs for verifier to grant at install and revoke permissions

9 years agoam 41b43d7c: am 7b0fa466: am 0f724601: Merge "Fix clip area behavior for REPLACE...
Chris Craik [Thu, 16 Jul 2015 22:50:17 +0000 (22:50 +0000)]
am 41b43d7c: am 7b0fa466: am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev

* commit '41b43d7c57593d6040b2f921bdf282b96a261fa8':
  Fix clip area behavior for REPLACE op

9 years agoam f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev
Alex Klyubin [Thu, 16 Jul 2015 22:49:54 +0000 (22:49 +0000)]
am f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev

* commit 'f7592b234acde62f0f0a93dad77284f12ca9980a':
  HMAC keys are authorized for exactly one digest.

9 years agoMerge "HMAC keys are authorized for exactly one digest." into mnc-dev
Alex Klyubin [Thu, 16 Jul 2015 22:40:02 +0000 (22:40 +0000)]
Merge "HMAC keys are authorized for exactly one digest." into mnc-dev

9 years agoam c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke...
Svet Ganov [Thu, 16 Jul 2015 22:38:13 +0000 (22:38 +0000)]
am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

* commit 'c00e49b6e4e4cc8356529567040d6ee3be8c1dc3':
  Add APIs for verifier to grant at install and revoke permissions

9 years agoam 7b0fa466: am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev
Chris Craik [Thu, 16 Jul 2015 22:38:09 +0000 (22:38 +0000)]
am 7b0fa466: am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev

* commit '7b0fa466b59002342d14030aafb7e2f9473ca14d':
  Fix clip area behavior for REPLACE op

9 years agoam 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282...
Dianne Hackborn [Thu, 16 Jul 2015 22:36:06 +0000 (22:36 +0000)]
am 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev

* commit '587f0c58f506b167667c789c16292c4e405eac1f':
  Work on issue #22516282: ChooserTarget URI grants not forwarded

9 years agoam 41bb77bd: am ebb56d9b: am 550f1d4e: Merge "Delete overscan setting by both unique...
Filip Gruszczynski [Thu, 16 Jul 2015 22:36:01 +0000 (22:36 +0000)]
am 41bb77bd: am ebb56d9b: am 550f1d4e: Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev

* commit '41bb77bd8c786a7594434ff0fb5243c8ba38a5ee':
  Delete overscan setting by both unique id and name.

9 years agoam d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions...
Svet Ganov [Thu, 16 Jul 2015 22:23:38 +0000 (22:23 +0000)]
am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

* commit 'd4b566bf56333de708908ce4accb5fb067be64f0':
  Add APIs for verifier to grant at install and revoke permissions

9 years agoam 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev
Chris Craik [Thu, 16 Jul 2015 22:23:34 +0000 (22:23 +0000)]
am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev

* commit '0f724601d78d8f36a297333227d9c460e10b3203':
  Fix clip area behavior for REPLACE op

9 years agoMerge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev
Svet Ganov [Thu, 16 Jul 2015 22:21:59 +0000 (22:21 +0000)]
Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

9 years agoam 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget...
Dianne Hackborn [Thu, 16 Jul 2015 22:20:27 +0000 (22:20 +0000)]
am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev

* commit '61f0aec4f390ecc7ad2c7a09ecc7b3a0a9f9bd8d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded

9 years agoam ebb56d9b: am 550f1d4e: Merge "Delete overscan setting by both unique id and name...
Filip Gruszczynski [Thu, 16 Jul 2015 22:20:22 +0000 (22:20 +0000)]
am ebb56d9b: am 550f1d4e: Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev

* commit 'ebb56d9b0c1567947ba2f98402a43920d9ba7ac0':
  Delete overscan setting by both unique id and name.

9 years agoam b32039ae: am c2bf95b0: am 89bcc24b: am d737ab17: am b09b84ca: Merge "DefaultPermis...
Makoto Onuki [Thu, 16 Jul 2015 22:20:17 +0000 (22:20 +0000)]
am b32039ae: am c2bf95b0: am 89bcc24b: am d737ab17: am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev

* commit 'b32039aeba173e87a64e44b5ee47fb6e78fca662':
  DefaultPermission: GET_ACCOUNTS is now in CONTACTS

9 years agoam 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants...
Dianne Hackborn [Thu, 16 Jul 2015 22:11:51 +0000 (22:11 +0000)]
am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev

* commit '9236af43d8418459b939049d4e7a092d2b58bff8':
  Work on issue #22516282: ChooserTarget URI grants not forwarded

9 years agoMerge "Fix clip area behavior for REPLACE op" into mnc-dev
Chris Craik [Thu, 16 Jul 2015 22:11:38 +0000 (22:11 +0000)]
Merge "Fix clip area behavior for REPLACE op" into mnc-dev

9 years agoam c2bf95b0: am 89bcc24b: am d737ab17: am b09b84ca: Merge "DefaultPermission: GET_ACC...
Makoto Onuki [Thu, 16 Jul 2015 22:05:10 +0000 (22:05 +0000)]
am c2bf95b0: am 89bcc24b: am d737ab17: am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev

* commit 'c2bf95b04a690685035ab8ae7435a0dd8617c130':
  DefaultPermission: GET_ACCOUNTS is now in CONTACTS

9 years agoam 550f1d4e: Merge "Delete overscan setting by both unique id and name." into cw...
Filip Gruszczynski [Thu, 16 Jul 2015 22:02:48 +0000 (22:02 +0000)]
am 550f1d4e: Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev

* commit '550f1d4eb3c9b0131106490841a6a369df639133':
  Delete overscan setting by both unique id and name.

9 years agoam aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded...
Dianne Hackborn [Thu, 16 Jul 2015 21:51:49 +0000 (21:51 +0000)]
am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev

* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded

9 years agoMerge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev
Filip Gruszczynski [Thu, 16 Jul 2015 21:47:26 +0000 (21:47 +0000)]
Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev

9 years agoam 89bcc24b: am d737ab17: am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is...
Makoto Onuki [Thu, 16 Jul 2015 21:45:26 +0000 (21:45 +0000)]
am 89bcc24b: am d737ab17: am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev

* commit '89bcc24b0f59b89d1ba9ae2529af3baa795d79ab':
  DefaultPermission: GET_ACCOUNTS is now in CONTACTS

9 years agoMerge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev
Dianne Hackborn [Thu, 16 Jul 2015 21:44:18 +0000 (21:44 +0000)]
Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev

9 years agoMerge "Using LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option."
Ying Wang [Thu, 16 Jul 2015 21:36:31 +0000 (21:36 +0000)]
Merge "Using LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option."

9 years agoam d737ab17: am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS...
Makoto Onuki [Thu, 16 Jul 2015 21:30:39 +0000 (21:30 +0000)]
am d737ab17: am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev

* commit 'd737ab1776d1bb7a3402137bdbf3afffe9860c5a':
  DefaultPermission: GET_ACCOUNTS is now in CONTACTS

9 years agoUsing LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option.
Ying Wang [Thu, 16 Jul 2015 21:20:22 +0000 (14:20 -0700)]
Using LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option.

So that the build system can clean up the stub out dir before
calling doclava.

Bug: 22534021
Change-Id: Iba33cf0a295e4ae32fdcad8bd326c2f52de5f875

9 years agoam b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
Makoto Onuki [Thu, 16 Jul 2015 21:19:33 +0000 (21:19 +0000)]
am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev

* commit 'b09b84cafde5ac31f5ef5c79f7a78db540824471':
  DefaultPermission: GET_ACCOUNTS is now in CONTACTS

9 years agoMerge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
Makoto Onuki [Thu, 16 Jul 2015 21:01:37 +0000 (21:01 +0000)]
Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev

9 years agoThat is not yellow
Chris Craik [Thu, 16 Jul 2015 20:44:26 +0000 (13:44 -0700)]
That is not yellow

Change-Id: I1db4e8c96b128fb84a8ba0b28df34be19608c48a

9 years agoFix clip area behavior for REPLACE op
Chris Craik [Thu, 16 Jul 2015 20:07:45 +0000 (13:07 -0700)]
Fix clip area behavior for REPLACE op

bug:22291400

Work around clippath-clipped-to-view-bounds behavior by
implementing REPLACE op fast path, avoiding the transition to
SkRegion/SkPath.

Change-Id: I63c1cf961db2d6e3759d83914de1036c9ac7497a

9 years agoam a73c88db: am d019bce4: am e7b7049b: am f8847c02: am db8fa48e: Merge "Return a...
Svet Ganov [Thu, 16 Jul 2015 20:26:25 +0000 (20:26 +0000)]
am a73c88db: am d019bce4: am e7b7049b: am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev

* commit 'a73c88dbb843bc8ce5f35782a89fe632c8330572':
  Return a result from Fragment#shouldShowRequestPermissionRationale

9 years agoRemove ImageViewBitmapDrawable class
Chris Craik [Tue, 14 Jul 2015 20:36:27 +0000 (13:36 -0700)]
Remove ImageViewBitmapDrawable class

Change-Id: Ie25b4b39cb5d0984981c153b036ea9ade95a10f7

9 years agoam d019bce4: am e7b7049b: am f8847c02: am db8fa48e: Merge "Return a result from Fragm...
Svet Ganov [Thu, 16 Jul 2015 20:12:01 +0000 (20:12 +0000)]
am d019bce4: am e7b7049b: am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev

* commit 'd019bce4129b224e638dd4ec235387f85d19e052':
  Return a result from Fragment#shouldShowRequestPermissionRationale

9 years agoam a4928832: am d7335400: am 57cea81f: am 70ab6b79: am 081649c2: am f4db2de8: am...
Robert Schaub [Thu, 16 Jul 2015 20:11:41 +0000 (20:11 +0000)]
am a4928832: am d7335400: am 57cea81f: am 70ab6b79: am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

* commit 'a49288327401c0a8b35dbe46157b0ac28d6d72c3':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."

9 years agoMerge "Clean up unncessary defines"
Chris Craik [Thu, 16 Jul 2015 20:11:02 +0000 (20:11 +0000)]
Merge "Clean up unncessary defines"

9 years agoam e7b7049b: am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldSho...
Svet Ganov [Thu, 16 Jul 2015 19:57:26 +0000 (19:57 +0000)]
am e7b7049b: am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev

* commit 'e7b7049b95fd02b0b4b4f42bb7a8a33d1b3296c4':
  Return a result from Fragment#shouldShowRequestPermissionRationale

9 years agoam d7335400: am 57cea81f: am 70ab6b79: am 081649c2: am f4db2de8: am 1b29a957: Merge...
Robert Schaub [Thu, 16 Jul 2015 19:56:16 +0000 (19:56 +0000)]
am d7335400: am 57cea81f: am 70ab6b79: am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

* commit 'd73354007291ad548dbeca0a756e54074aee7828':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."

9 years agoam 953dd1c8: am 02641dfa: am 786946db: am 9e55d57d: am 8983420d: Merge "Don\'t spam...
Dianne Hackborn [Thu, 16 Jul 2015 19:49:32 +0000 (19:49 +0000)]
am 953dd1c8: am 02641dfa: am 786946db: am 9e55d57d: am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev

* commit '953dd1c831030f435034abe458d0b1a2afacded2':
  Don't spam the system with unique wake lock names.

9 years agoam f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermi...
Svet Ganov [Thu, 16 Jul 2015 19:42:29 +0000 (19:42 +0000)]
am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev

* commit 'f8847c02dce2c8ca66d29f8debf120c275b41f09':
  Return a result from Fragment#shouldShowRequestPermissionRationale

9 years agoam 57cea81f: am 70ab6b79: am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added...
Robert Schaub [Thu, 16 Jul 2015 19:42:24 +0000 (19:42 +0000)]
am 57cea81f: am 70ab6b79: am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

* commit '57cea81f6b82841044c113a05663a4da5b69f355':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."

9 years agoam 02641dfa: am 786946db: am 9e55d57d: am 8983420d: Merge "Don\'t spam the system...
Dianne Hackborn [Thu, 16 Jul 2015 19:35:55 +0000 (19:35 +0000)]
am 02641dfa: am 786946db: am 9e55d57d: am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev

* commit '02641dfab1d36ac2234a479fc638b6196dc12da4':
  Don't spam the system with unique wake lock names.

9 years agoam 70ab6b79: am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location...
Robert Schaub [Thu, 16 Jul 2015 19:27:24 +0000 (19:27 +0000)]
am 70ab6b79: am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

* commit '70ab6b79147db0894b242cdb597ea5ec9e2d7dac':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."

9 years agoam db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRational...
Svet Ganov [Thu, 16 Jul 2015 19:27:18 +0000 (19:27 +0000)]
am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev

* commit 'db8fa48ed0864125a07f2bbe078fd60abd875ac7':
  Return a result from Fragment#shouldShowRequestPermissionRationale

9 years agoam c0036d03: am 48869114: am a6a5ba19: am c84bf849: am a4911ed9: Merge "Verfiy global...
Todd Kennedy [Thu, 16 Jul 2015 19:21:25 +0000 (19:21 +0000)]
am c0036d03: am 48869114: am a6a5ba19: am c84bf849: am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev

* commit 'c0036d03a47ebe0eadee68a9db31e86d88153422':
  Verfiy global apps with device owner

9 years agoam d6a9c732: am d96243a1: am 10653cef: Merge "fix BNNM docs"
Miao Wang [Thu, 16 Jul 2015 19:21:14 +0000 (19:21 +0000)]
am d6a9c732: am d96243a1: am 10653cef: Merge "fix BNNM docs"

* commit 'd6a9c732920831ea6e62bc0cc7ac0b26d021b176':
  fix BNNM docs

9 years agoam 69b301ec: am bc72debf: am 40d16bd0: am fd2a5f14: am 11813232: Merge "Animate app...
Wale Ogunwale [Thu, 16 Jul 2015 19:21:03 +0000 (19:21 +0000)]
am 69b301ec: am bc72debf: am 40d16bd0: am fd2a5f14: am 11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev

* commit '69b301ec55db3c87f8e53629f3777ecdc31fd3b5':
  Animate app exit for cases where the app is already hidden before transition

9 years agoam be7e2a47: am 599287b1: am b4d49a4d: am d5612d06: am ba4f0757: Merge "Don\'t crash...
John Reck [Thu, 16 Jul 2015 19:20:46 +0000 (19:20 +0000)]
am be7e2a47: am 599287b1: am b4d49a4d: am d5612d06: am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev

* commit 'be7e2a476fd8f3e25710a96a391a2d9ca2ddad99':
  Don't crash on makeCurrent fail

9 years agoam 786946db: am 9e55d57d: am 8983420d: Merge "Don\'t spam the system with unique...
Dianne Hackborn [Thu, 16 Jul 2015 19:19:57 +0000 (19:19 +0000)]
am 786946db: am 9e55d57d: am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev

* commit '786946db0b62aa7eb347337e1e34247bb0c15865':
  Don't spam the system with unique wake lock names.

9 years agoMerge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
Svet Ganov [Thu, 16 Jul 2015 19:16:54 +0000 (19:16 +0000)]
Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev

9 years agoam 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps...
Robert Schaub [Thu, 16 Jul 2015 19:10:48 +0000 (19:10 +0000)]
am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

* commit '081649c2b5ffc1d9ea7a389cc9687659544a535e':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."

9 years agoam 9e55d57d: am 8983420d: Merge "Don\'t spam the system with unique wake lock names...
Dianne Hackborn [Thu, 16 Jul 2015 19:04:26 +0000 (19:04 +0000)]
am 9e55d57d: am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev

* commit '9e55d57dc7fccbeae4bb8ff4be322d7e2b87dacc':
  Don't spam the system with unique wake lock names.

9 years agoam f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under...
Robert Schaub [Thu, 16 Jul 2015 18:57:39 +0000 (18:57 +0000)]
am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

* commit 'f4db2de881d197db0dfd76645dfd7a95b1f8f0de':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."

9 years agoam 48869114: am a6a5ba19: am c84bf849: am a4911ed9: Merge "Verfiy global apps with...
Todd Kennedy [Thu, 16 Jul 2015 18:56:03 +0000 (18:56 +0000)]
am 48869114: am a6a5ba19: am c84bf849: am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev

* commit '488691144f981943dfe717b47108a2dc76075397':
  Verfiy global apps with device owner

9 years agoam 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev
Dianne Hackborn [Thu, 16 Jul 2015 18:45:37 +0000 (18:45 +0000)]
am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev

* commit '8983420d30d3e962c519d7f9a5d8b8ea4bc3f42c':
  Don't spam the system with unique wake lock names.

9 years agoam 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring...
Robert Schaub [Thu, 16 Jul 2015 18:40:37 +0000 (18:40 +0000)]
am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

* commit '1b29a95789c29174d5e4d526f6449c2c354ef3b3':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."

9 years agoam a6a5ba19: am c84bf849: am a4911ed9: Merge "Verfiy global apps with device owner...
Todd Kennedy [Thu, 16 Jul 2015 18:38:14 +0000 (18:38 +0000)]
am a6a5ba19: am c84bf849: am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev

* commit 'a6a5ba19279b6a1e3af22ad7a266341ad6ff1652':
  Verfiy global apps with device owner

9 years agoDefaultPermission: GET_ACCOUNTS is now in CONTACTS
Makoto Onuki [Thu, 16 Jul 2015 18:38:00 +0000 (11:38 -0700)]
DefaultPermission: GET_ACCOUNTS is now in CONTACTS

Bug 22532312

Change-Id: If7ad0faa3a196bb28da1ddc13788c0430df1d1ee

9 years agoMerge "Don't spam the system with unique wake lock names." into mnc-dev
Dianne Hackborn [Thu, 16 Jul 2015 18:31:14 +0000 (18:31 +0000)]
Merge "Don't spam the system with unique wake lock names." into mnc-dev

9 years agoam d96243a1: am 10653cef: Merge "fix BNNM docs"
Miao Wang [Thu, 16 Jul 2015 18:28:45 +0000 (18:28 +0000)]
am d96243a1: am 10653cef: Merge "fix BNNM docs"

* commit 'd96243a1d7b2ce660b256694cd465b240e7413f1':
  fix BNNM docs

9 years agoam c84bf849: am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
Todd Kennedy [Thu, 16 Jul 2015 18:21:54 +0000 (18:21 +0000)]
am c84bf849: am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev

* commit 'c84bf8498e51b04f8be5bfea0616a4bc0bc81eee':
  Verfiy global apps with device owner

9 years agoMerge "docs: Added "location" before "gps" in list under "Declaring hardware ......
Robert Schaub [Thu, 16 Jul 2015 18:21:19 +0000 (18:21 +0000)]
Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

9 years agoam 10653cef: Merge "fix BNNM docs"
Miao Wang [Thu, 16 Jul 2015 18:13:51 +0000 (18:13 +0000)]
am 10653cef: Merge "fix BNNM docs"

* commit '10653cef2ae7eb6e1dff1063ddde24347c350bae':
  fix BNNM docs

9 years agoam a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
Todd Kennedy [Thu, 16 Jul 2015 18:09:51 +0000 (18:09 +0000)]
am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev

* commit 'a4911ed97102b638a373adcdae7e4c9b3c64cc30':
  Verfiy global apps with device owner

9 years agoMerge "fix BNNM docs"
Miao Wang [Thu, 16 Jul 2015 18:00:01 +0000 (18:00 +0000)]
Merge "fix BNNM docs"

9 years agoMerge "Verfiy global apps with device owner" into mnc-dev
Todd Kennedy [Thu, 16 Jul 2015 17:59:32 +0000 (17:59 +0000)]
Merge "Verfiy global apps with device owner" into mnc-dev

9 years agoam bc72debf: am 40d16bd0: am fd2a5f14: am 11813232: Merge "Animate app exit for cases...
Wale Ogunwale [Thu, 16 Jul 2015 17:56:17 +0000 (17:56 +0000)]
am bc72debf: am 40d16bd0: am fd2a5f14: am 11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev

* commit 'bc72debf36247919a4c9d754f4057ca6ae038454':
  Animate app exit for cases where the app is already hidden before transition

9 years agoWork on issue #22516282: ChooserTarget URI grants not forwarded
Dianne Hackborn [Thu, 16 Jul 2015 17:52:52 +0000 (10:52 -0700)]
Work on issue #22516282: ChooserTarget URI grants not forwarded

Add new option to startActivityAsCaller() which allows you to
specify that we should not do security checks on the target
activity being launched.

Change-Id: Ie6b28807b96fef35ccdff93b0a01066cfd8fa307

9 years agoam 599287b1: am b4d49a4d: am d5612d06: am ba4f0757: Merge "Don\'t crash on makeCurren...
John Reck [Thu, 16 Jul 2015 17:43:53 +0000 (17:43 +0000)]
am 599287b1: am b4d49a4d: am d5612d06: am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev

* commit '599287b14d32bbe6b5eea4e610cc14d8224362b6':
  Don't crash on makeCurrent fail

9 years agoam 40d16bd0: am fd2a5f14: am 11813232: Merge "Animate app exit for cases where the...
Wale Ogunwale [Thu, 16 Jul 2015 17:43:34 +0000 (17:43 +0000)]
am 40d16bd0: am fd2a5f14: am 11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev

* commit '40d16bd07cf9bdf5fffd80ef7c2f5b18b245c51a':
  Animate app exit for cases where the app is already hidden before transition