Commit Graph

4267 Commits

Author SHA1 Message Date
Robert Sesek
a506d23ca8 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095c6 am: ffc715b8f5
am: 4b7f83870b

* commit '4b7f83870be5a0fae07ff7a254b25cf258a24f39':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: I3562273285d115aa5b9822a3586b2730c59a1203
2016-05-18 15:43:14 +00:00
Robert Sesek
4b7f83870b Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095c6
am: ffc715b8f5

* commit 'ffc715b8f5ad7a4cbdb8805f0fd916501ac3ba64':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: I1b5570d889c20f8a029a5321a290b6807ce6af77
2016-05-18 15:39:05 +00:00
Robert Sesek
ffc715b8f5 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
am: f45bc095c6

* commit 'f45bc095c6cef916f5f801fb320b3413f0fc099a':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: I5306ff5f4e9abe6161616873e752cf4d54ed6408
2016-05-18 15:32:54 +00:00
Robert Sesek
f45bc095c6 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 2016-05-18 15:25:41 +00:00
Yohei Yukawa
af15c8bcae Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681
am: bf4c8f730b

* commit 'bf4c8f730b167e5ee65ed7c59dfa1d7867b63fcc':
  Move LocaleList to avoid layering violation.

Change-Id: I78fee5269f7428e34b196573575784fc15cb1372
2016-05-18 02:25:10 +00:00
Yohei Yukawa
bf4c8f730b Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13
am: ddaf3f4681

* commit 'ddaf3f468195e5aa47617317c08e9e2c35bcfeee':
  Move LocaleList to avoid layering violation.

Change-Id: I7dbe5c3d552a7350ab61c929f431e2a3cffdee5b
2016-05-18 02:22:07 +00:00
Yohei Yukawa
ddaf3f4681 Merge "Move LocaleList to avoid layering violation." into nyc-dev
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
2016-05-18 02:18:38 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation.
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Robert Sesek
55b2d11cd3 Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.
Bug: 28775488
Change-Id: Ic0473d3664671f0ac5df8412f61ca8c1d029887f
2016-05-17 18:53:13 -04:00
Dianne Hackborn
fab87630f3 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5 am: a24af982ff
am: ae5664af28

* commit 'ae5664af28e78c685c4ffec671254d75f1c932fb':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I96430b2073f2aafba489e5d2a0d11822709f4206
2016-05-17 18:44:56 +00:00
Dianne Hackborn
ae5664af28 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5
am: a24af982ff

* commit 'a24af982fffeeb6d3d4919907b5c27064c5a8ff1':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iea2b8a6b86f10122ea763e93e1516fce43e58dfa
2016-05-17 18:39:42 +00:00
Dianne Hackborn
a24af982ff Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I749b455402caef335239b540ec8883a8d7b2a974
2016-05-17 18:32:46 +00:00
Makoto Onuki
1b537cc623 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev am: 8295332d83
am: 37d5cb3181

* commit '37d5cb3181b4fc94b5e180f1a011330b893fcd84':
  ShortcutManager: API changes for DR

Change-Id: Id585b05388cb487aba19f5c7fee3e13bd467e808
2016-05-17 18:20:19 +00:00
Dianne Hackborn
607844efa5 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 2016-05-17 18:19:36 +00:00
Makoto Onuki
37d5cb3181 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev
am: 8295332d83

* commit '8295332d83d1e664a7ef3a731370ae71242688a1':
  ShortcutManager: API changes for DR

Change-Id: I0006667d4bbe2fa92015ac442ae1e8362cbcacbd
2016-05-17 18:14:39 +00:00
Makoto Onuki
8295332d83 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 2016-05-17 18:01:29 +00:00
Xiaohui Chen
bb803cf2f6 pm: query both direct boot un/aware activities
Bug: 28762791
Change-Id: I64009c75ae7ac8784e739349b70d0413f0b4681a
2016-05-17 16:24:18 +00:00
Makoto Onuki
20c95f854e ShortcutManager: API changes for DR
See https://goto.google.com/shortcutmanager-spec-dr for
the details.

This CL contains changes to ShortcutInfo and all the new API
entry points, but not the implementation of the new APIs.

- ShortcutInfo.activityComponent is now mandatory.
- Publishers can now disable shortcuts.  ShortcutInfo can now have
"disabled message".
- ShortcutInfo now supports string resources for all the String
fields.
  -> When launcher fetches shortcuts, ShortcutService will
  automatically load resources and expose as strings.
- LauncherApps now supports getShortcutIconDrawable() and
getShortcutBadgedIconDrawable() to be consistent with
LauncherActivityInfo.

- ShortcutInfo.weight is replaced with "rank".

- Added ShortcutManager.reportShortcutUsed(), which will be used for
usage tracking / suggestion.

Bug 28536054
Bug 28536066
Bug 28564134
Bug 28594168

Change-Id: Ib8245b39bb1e753991a9de89c0b73accacd90355
2016-05-16 16:25:50 -07:00
Alan Viverette
b04a9f6595 Merge "Update docs for ColorStateList to include alpha" into nyc-dev am: 5bcf7650b4 am: 3818d32374
am: c46f3a4fe9

* commit 'c46f3a4fe98448b931ab2f933bd52cb7e51fa56d':
  Update docs for ColorStateList to include alpha

Change-Id: Ic01d73f1173ed1836fd3a762db428b2af5b5c50a
2016-05-16 19:50:09 +00:00
Alan Viverette
c46f3a4fe9 Merge "Update docs for ColorStateList to include alpha" into nyc-dev am: 5bcf7650b4
am: 3818d32374

* commit '3818d32374374f568805a9a5eb7c4468aec78862':
  Update docs for ColorStateList to include alpha

Change-Id: Ife972ac77358719a78c6ead2c2866e8de84e722e
2016-05-16 19:44:48 +00:00
Alan Viverette
3818d32374 Merge "Update docs for ColorStateList to include alpha" into nyc-dev
am: 5bcf7650b4

* commit '5bcf7650b492ca9ce5b685c5e0f535b5927af0c6':
  Update docs for ColorStateList to include alpha

Change-Id: Ibb7c034061ec5c6b540e44ca856bed2624c14629
2016-05-16 19:40:47 +00:00
Alan Viverette
f10697e17b Merge "Update docs for ColorStateList to include alpha" into nyc-dev
am: 5bcf7650b4

* commit '5bcf7650b492ca9ce5b685c5e0f535b5927af0c6':
  Update docs for ColorStateList to include alpha

Change-Id: I1dc16f964509cec422622da2ac60e5428b8203f6
2016-05-16 19:40:26 +00:00
Alan Viverette
5bcf7650b4 Merge "Update docs for ColorStateList to include alpha" into nyc-dev 2016-05-16 19:30:38 +00:00
Alan Viverette
582dcac856 Update docs for ColorStateList to include alpha
Bug: 28760030
Change-Id: I309364002220b9896f5ddf29dabde79636a722e9
2016-05-16 12:37:55 -04:00
Dianne Hackborn
0c4e6a8da3 Fix issue #27532364: Security Vulnerability in IIntentSender.send
We need to make IIntentSender oneway...  but when the system is
calling that for itself, it needs to be able to return a result code.

Solution: instead of directly calling the interface, we have a new
IPC through the activity manager.  If the thing being used is the
activity manager impl, it can do the synchronous send and return
the result directly in place.  If not, you only get asynchronous
sending and thus never a failure result back (too bad for you!).

Change-Id: I4096e5b00063e8dba66230585a2dfe67e35e8092
2016-05-13 17:37:08 -07:00
Steve Pomeroy
4c8c470015 Merge "ContentValues: improve documentation" into nyc-dev
am: 33d0ff9959

* commit '33d0ff995976533f9989cd6ec95c3de5ba9aee05':
  ContentValues: improve documentation

Change-Id: I29244d0c039abcd08139e2814bb465e2e5b9e03a
2016-05-13 01:17:57 +00:00
Steve Pomeroy
b31b1cc5ff ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.

Signed-off-by: Steve Pomeroy <steve@staticfree.info>

(cherry picked from commit 1276b5f29e)

Change-Id: Id6f4e93dcca64dd41daeb4066d804ff173f4747b
2016-05-12 16:51:52 -07:00
Steve Pomeroy
3f0fcdb1f6 Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902 am: b6c826227d
am: d88ca0e659

* commit 'd88ca0e659d89147e62addac01ce08192beb051e':
  ContentValues: improve documentation

Change-Id: Id42ec6e2c361bd0b8a279c8e42f8ac5232f0850e
2016-05-12 22:31:49 +00:00
Steve Pomeroy
d88ca0e659 Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902
am: b6c826227d

* commit 'b6c826227dfbc1cdb565098a9df5b897dd1137f3':
  ContentValues: improve documentation

Change-Id: I6a3f730971777a19460f9afeafca1878c4fd522d
2016-05-12 22:29:25 +00:00
Steve Pomeroy
b6c826227d Merge "ContentValues: improve documentation" am: b44d4207c1
am: 78e5a04902

* commit '78e5a0490278bc12cb7e3c12225aba05639c922f':
  ContentValues: improve documentation

Change-Id: Ifce0816dc5565e6b7944de92ee814f97cb4753b6
2016-05-12 22:27:12 +00:00
Steve Pomeroy
1276b5f29e ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.

Change-Id: Iddf54da093e97c32da2568eab8802b1b2715303b
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
2016-05-12 21:18:15 +00:00
Makoto Onuki
82c64a485a Merge "Remove ShortcutManager" into nyc-dev
am: 26edcba2c9

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I4b99a5fe6d73400070ba5829573255283c7b7a5c
2016-05-12 16:36:06 +00:00
Makoto Onuki
26edcba2c9 Merge "Remove ShortcutManager" into nyc-dev 2016-05-12 16:32:56 +00:00
The Android Automerger
10b889de7d stephenli Manually merge commit '68fffa5'
* commit '68fffa5': (23 commits)
  Fix smallest width configuration calculation
  docs: DoDS, wearable reference docs
  Switch the default text selection handles to Material style.
  docs: Noted minor API changes in release notes
  docs: added "billions" doc in Distribute>Essentials
  Remove wear design pages redirecting to design/wear
  correct the support library redirects to redirect whole path
  Stop saving ActionMenuItemView state.
  Fix iterator double-advance in ContentObserverController
  TIF: Remove the uniqueness check for track ID from notifyTracksChanged
  Update and add attributes to the JavaDoc for VectorDrawable
  Use Q=100 JPEG instead of PNG for wallpaper display
  Fix issue #28400000: Settings memory UI still showing z-ram...
  docs: Updated support library revision history for 23.4.0
  docs: Updates to notifications for DP3
  docs: Added emoji section to api overview.
  Fixed a bug where the QS was animating wrong when closing
  Fix KeyguardManager.isSecure() to observe work profile
  cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
  Docs: Added new Whitelist feature to Data Saver for DP3
  ...
2016-05-12 02:10:33 +00:00
Adam Lesinski
ad3773a154 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev am: 3723194dc8
am: 04d676b3ae

* commit '04d676b3ae36bca3f3f80b522024121f2238835d':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: Id439d6d314805f378bc068144eabd9a16a521f25
2016-05-12 01:23:54 +00:00
Adam Lesinski
04d676b3ae Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
am: 3723194dc8

* commit '3723194dc831f4734d465602b2e21449d9357c2e':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: I0b86c2bd861a7de788917c6bae7bccf02dc97b31
2016-05-12 01:11:21 +00:00
Adam Lesinski
ebfb372876 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
am: 3723194dc8

* commit '3723194dc831f4734d465602b2e21449d9357c2e':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: Iafdc65be9a8045c10ee485685a4222ece087e031
2016-05-12 01:11:18 +00:00
Adam Lesinski
3723194dc8 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev 2016-05-12 00:59:29 +00:00
Makoto Onuki
538c440c33 Remove ShortcutManager
Bug 28704708

Change-Id: If7b739adeec38d81d554fc1cf34c81194f5d67b9
2016-05-11 14:25:55 -07:00
Todd Kennedy
728fe71b21 Merge "Fix secondary ABI instrumetion" into nyc-dev am: f09f069936 am: fc7701c569
am: d2ebc5e3ab

* commit 'd2ebc5e3ab900905b4b14de55e4be9d0e70c51d6':
  Fix secondary ABI instrumetion

Change-Id: Ieceae5d3fe442bbd0c6821ead5dc37dc2ee83a71
2016-05-11 14:47:09 +00:00
Todd Kennedy
d2ebc5e3ab Merge "Fix secondary ABI instrumetion" into nyc-dev am: f09f069936
am: fc7701c569

* commit 'fc7701c56923369bb30eae6559dfbc100a174477':
  Fix secondary ABI instrumetion

Change-Id: I88afbda2d0b4f87f03b9806ff6de9a4066bd4dac
2016-05-11 14:44:34 +00:00
Todd Kennedy
fc7701c569 Merge "Fix secondary ABI instrumetion" into nyc-dev
am: f09f069936

* commit 'f09f0699369c02a6a46fbff68c02b00a7c703697':
  Fix secondary ABI instrumetion

Change-Id: I7a48511c8038725524abd8fc0adbd86e9e9fe09c
2016-05-11 14:41:44 +00:00
Todd Kennedy
9580593e5d Merge "Fix secondary ABI instrumetion" into nyc-dev
am: f09f069936

* commit 'f09f0699369c02a6a46fbff68c02b00a7c703697':
  Fix secondary ABI instrumetion

Change-Id: I0ad719338b8cbcf9cf90526d2e0196aa25ff07ad
2016-05-11 14:41:41 +00:00
Todd Kennedy
f09f069936 Merge "Fix secondary ABI instrumetion" into nyc-dev 2016-05-11 14:35:19 +00:00
Greg Kaiser
b482032705 Merge "GradientColor: Fix typo in documentation." into nyc-dev am: a452dd3fd9 am: 9311165c2c
am: bac3e57f3d

* commit 'bac3e57f3d5e1d4b1ec0b184d4bbc9657f7d0f13':
  GradientColor: Fix typo in documentation.

Change-Id: I91779eec11c9966c9f1ea8e6566c96a301c50f6d
2016-05-11 12:45:21 +00:00
Greg Kaiser
bac3e57f3d Merge "GradientColor: Fix typo in documentation." into nyc-dev am: a452dd3fd9
am: 9311165c2c

* commit '9311165c2cbb42fe37a42dc916e303ac180f9f6c':
  GradientColor: Fix typo in documentation.

Change-Id: I590125c62d1e5b73bfe3b0255f69c07daf3d78b9
2016-05-11 12:42:17 +00:00
Greg Kaiser
9311165c2c Merge "GradientColor: Fix typo in documentation." into nyc-dev
am: a452dd3fd9

* commit 'a452dd3fd97fc1cae971abad5bfcb40013dad0c6':
  GradientColor: Fix typo in documentation.

Change-Id: I392ac824d733dcbeb2e79d5be4ad1668ad3400cc
2016-05-11 12:39:38 +00:00
Greg Kaiser
5662120923 Merge "GradientColor: Fix typo in documentation." into nyc-dev
am: a452dd3fd9

* commit 'a452dd3fd97fc1cae971abad5bfcb40013dad0c6':
  GradientColor: Fix typo in documentation.

Change-Id: I647222141e85163cefe2241a96439f0eb3d7a97a
2016-05-11 12:39:34 +00:00
Greg Kaiser
2d609eda74 GradientColor: Fix typo in documentation.
Bug: 28678266
Change-Id: I8f551108643698a1b6c573911509a4e48ad88783
2016-05-10 17:05:31 -07:00
Makoto Onuki
7608f5d214 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev am: 4a3b597f55
am: c9289b8053

* commit 'c9289b805307ff071ad2b17936bfb4b4a6f4ad84':
  Refactoring ShortcutManager + bug fixes.

Change-Id: I9b584cd3ff0125294556fc3ca56cc01895167367
2016-05-10 23:09:26 +00:00