Commit Graph

4230 Commits

Author SHA1 Message Date
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
3723194dc8 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev 2016-05-12 00:59:29 +00: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
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
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
Makoto Onuki
c9289b8053 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev
am: 4a3b597f55

* commit '4a3b597f557ef900299202ef88a6e601c0629368':
  Refactoring ShortcutManager + bug fixes.

Change-Id: Ief3a0dd2c81a2343895a88d9049b48d19bac6ac1
2016-05-10 23:07:02 +00:00
Todd Kennedy
e713efcac1 Fix secondary ABI instrumetion
When installing an APK that supports multiple ABIs, the ABI installed
can be forced to the secondary ABI [i.e. On devices that support both
32 and 64 bit variants, the 32-bit version can be forced when it's
the secondary ABI.] In this case, instrumenting the class always tried
to use the primary ABI. Instead of blindly using the primary ABI and
dropping the secondary ABI, we propagate both ABIs and make a
decision on which one should be chosen.

Bug: 28406240
Change-Id: I7ebb2fd264d2281912afd30f6d73ccb460f9cf85
2016-05-10 15:16:13 -07:00
Makoto Onuki
c51b2876ec Refactoring ShortcutManager + bug fixes.
- Don't pass the ShortcutService instance as an argument.  This tiny
optimization is no longer meaningful now that PackageShortcut and
PackageLauncher have reference to ShortcutUser.

- Rename mLauncherComponent to mDefaultLauncherComponent for clarity.

- Don't instantiate ShortcutPackage instances when not needed.

- Don't allow intents with a null action.

- Also improve javadoc.

Bug 28592642
Bug 28474517
Bug 28557169

Change-Id: I8790d3494bf3b92c143c02824b0ed0e514504baa
2016-05-10 14:28:31 -07:00
Adam Lesinski
991357fe25 BluetoothManager: Make requestControllerActivityInfo one call
Instead of making multiple calls into the Bluetooth service,
make one call that can timeout. This helps prevent cases
when the Bluetooth process hangs and the system_server is calling into
it and causes a WATCHDOG restart.

Bug:28658141
Change-Id: I37778b7b6e508be420a21bdf23593ae89b38f5b8
2016-05-10 14:00:03 -07:00
Hans Boehm
d89abcf16d Merge "Improve grammar in startService() documentation." am: e3a25ad692 am: cc9c83dbd4 am: 1a72cf2e4f
am: 3bc625a30a

* commit '3bc625a30af39a25a2dec5a5e70fb3fbd38c98ca':
  Improve grammar in startService() documentation.

Change-Id: Id179761ee138cecf7245788735dd3a3e063f9bc0
2016-05-06 17:51:43 +00:00
Hans Boehm
3bc625a30a Merge "Improve grammar in startService() documentation." am: e3a25ad692 am: cc9c83dbd4
am: 1a72cf2e4f

* commit '1a72cf2e4f7d94f004979ee140fbe3f17c5e350a':
  Improve grammar in startService() documentation.

Change-Id: Ifd50bd9f2b8c83e657bc6df419e70b30532649d0
2016-05-06 17:47:23 +00:00
Hans Boehm
1a72cf2e4f Merge "Improve grammar in startService() documentation." am: e3a25ad692
am: cc9c83dbd4

* commit 'cc9c83dbd4123cf4677cd351fd0b96d9d04ffbee':
  Improve grammar in startService() documentation.

Change-Id: I7a7296839c0b9ec89002dead994cc346e1969567
2016-05-06 17:41:18 +00:00
Hans Boehm
fb9f6acd6f Improve grammar in startService() documentation.
Change-Id: If72f710caa2e85512636d6f7ddacff2426cfb835
2016-05-05 13:09:28 -07:00
Ruben Brunk
f9d60d034e Merge "Update VR API docs." into nyc-dev am: 01d232988a am: 2d1a1a4521
am: d12543c983

* commit 'd12543c9836ebae9f82045ef626d09da2654363f':
  Update VR API docs.

Change-Id: Ic26060e0684b983767b399490e8d47c0420a1c11
2016-05-05 00:49:47 +00:00
Ruben Brunk
d12543c983 Merge "Update VR API docs." into nyc-dev am: 01d232988a
am: 2d1a1a4521

* commit '2d1a1a45219d4946527c284eb801a1c9e966966c':
  Update VR API docs.

Change-Id: I6f3c0348d98db2d7c8f6e3d757ac77f02d4e179f
2016-05-04 23:44:04 +00:00
Ruben Brunk
17f3a40645 Merge "Update VR API docs." into nyc-dev
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I1b2cc88ca390c90d42cae3736aaf986e6c0e9396
2016-05-04 23:43:50 +00:00
Ruben Brunk
01d232988a Merge "Update VR API docs." into nyc-dev 2016-05-04 23:35:44 +00:00
Makoto Onuki
0e86dfb802 Merge "Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev am: 5b9d876ef5" into nyc-mr1-dev-plus-aosp
am: ccf9c83765

* commit 'ccf9c8376595ddbed64cedd236349cb99a2e8708':
  ShortcutManaegr: bug fixes

Change-Id: I2aeb67ca5f46165b63e685c90d8acf6cb909b351
2016-05-04 22:09:57 +00:00
Vladislav Kaznacheev
9f842251b0 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev am: 221c6e6db7 am: 423c902258
am: 040646bb08

* commit '040646bb084632713436ee6a2a0b9de99d4eee8d':
  Fix ClipData JavaDoc and behavior that contradicts JavaDoc

Change-Id: Ifa6973f839dd2c8f4bac8befd6ad445f68a462d9
2016-05-04 21:54:46 +00:00
Makoto Onuki
5b9d876ef5 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev 2016-05-04 21:28:17 +00:00
Makoto Onuki
8569452603 ShortcutManaegr: bug fixes
Fixes 28590035
Fixes 28586105

Change-Id: Ia11d29e4996ad5b47b279a3c04d9586695cdc0a5
2016-05-04 13:00:41 -07:00
TreeHugger Robot
221c6e6db7 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev 2016-05-04 17:07:13 +00:00
Vladislav Kaznacheev
f67661cc7a Fix ClipData JavaDoc and behavior that contradicts JavaDoc
1. Expand JavaDoc for ClipData.addItem to clarify how MIME types are affected.
2. Add "text/uri-list" to MIME type list only for non-content URIs (as JavaDoc explicitly says).

Bug: 28564003
Change-Id: I074daf34310323725690a9ba2c7dff0542ed6349
2016-05-03 16:48:24 -07:00
Vladislav Kaznacheev
6b8b7996ff Merge "Merge "Fix typos in ClipData JavaDoc" into nyc-dev am: 77843a4213 am: 0fd5036fec" into nyc-mr1-dev-plus-aosp
am: 1adf75e6bb

* commit '1adf75e6bb06255cc565024efc10d96936f03f0d':
  Fix typos in ClipData JavaDoc

Change-Id: I8891f67276fc00339e5e632f6b0b2ae62159b0af
2016-05-03 19:42:58 +00:00
TreeHugger Robot
77843a4213 Merge "Fix typos in ClipData JavaDoc" into nyc-dev 2016-05-03 19:28:32 +00:00
Vladislav Kaznacheev
7e4669c5a6 Fix typos in ClipData JavaDoc
Also removed the obsolete text regarding iconic representation
and fixed some whitespace.

Bug: 28536304
Change-Id: I55ca681b86a121018903a41fff228e7c6126c7e7
2016-05-03 10:09:06 -07:00
Makoto Onuki
d1bc17aacd Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev am: 59cfcb502d
am: 2c0af8597d

* commit '2c0af8597dd3edb155893453dbb03027dc95135e':
  ShortcutManager: finishing touches

Change-Id: Id54d01e50b8120b898263a674b1886e2f5c16ac4
2016-05-03 16:45:09 +00:00
Makoto Onuki
7d164d35a4 Merge "ShortcutManager: finishing touches" into nyc-dev 2016-05-03 16:27:46 +00:00
Ruben Brunk
927d3453d3 Update VR API docs.
Bug: 28526281
Change-Id: Iff48d02a2fee542c5ded7fc8cd6cf74957eb738c
2016-05-02 19:30:51 -07:00
Svet Ganov
e15ad0a4ef Merge "Disable unused features" into nyc-dev am: d4d1512b64 am: d76b1a5dad
am: fa58b2752a

* commit 'fa58b2752abe8f60391f73da5cca61dffd0208b5':
  Disable unused features

Change-Id: I7e5894d96f76e1139b02bb23c168f1f0f7623b14
2016-05-03 01:45:17 +00:00
Svetoslav Ganov
d4d1512b64 Merge "Disable unused features" into nyc-dev 2016-05-03 01:37:01 +00:00
Svet Ganov
a7532cfa46 Disable unused features
The multi-package APKs feature was not validated and is now disabled.
Also the ephemeral work was postponed which requires disabling of the
ephemeral cookie APIs.

bug:28514747

Change-Id: Iab7f11c503a76bcc414408dfebdf200843db814e
2016-05-02 18:36:13 -07:00
Raph Levien
779869cabf Merge "Make LocaleList constructor non-nullable" into nyc-dev am: 4d826831b5 am: c29bc443f8
am: 16e416ec69

* commit '16e416ec69cb281e669c2f38833de33ebaf22962':
  Make LocaleList constructor non-nullable

Change-Id: I4536dacdd94329f2ab8fecef6f5e868d6895b1fd
2016-05-03 00:38:48 +00:00
Raph Levien
4d826831b5 Merge "Make LocaleList constructor non-nullable" into nyc-dev 2016-05-03 00:15:24 +00:00
Todd Kennedy
c699a02479 Merge "use \'int\' for min sdk version" into nyc-dev am: 6a3948bc12 am: 09bad50ef4
am: fa1f49c504

* commit 'fa1f49c504abe7a7eefe87fac54f775f22e301f4':
  use 'int' for min sdk version

Change-Id: I85590aa529cab7765137ee8658d78da5246a844a
2016-05-02 23:46:55 +00:00
Todd Kennedy
6e2e7f585b use 'int' for min sdk version
per api council

Change-Id: Id3c1191534f61a0d511a6e9932f50ee613830999
2016-05-02 15:07:32 -07:00
Raph Levien
10ea92aefa Make LocaleList constructor non-nullable
This commit makes the LocaleList constructor require non-null
arguments in all cases, and fixes all uses of LocaleList that could
previously pass a null to use getEmptyLocaleList() instead (which is
preferred anyway becaues it avoids an allocation.

Bug: 28460668
Change-Id: I4b8b3cfa82914412731c2b79003951c46cb2afa1
2016-05-02 12:57:56 -07:00
Makoto Onuki
4d36b3a8c5 ShortcutManager: finishing touches
- Change back the throttling quota to 10 calls / day
- Foreground apps are no longer throttled, and when an app comes to
foreground the call counter will be reset.
- When the system locale changes, reset throttling for all packages
for all users.
  See LocalService.onSystemLocaleChangedNoLock() for how it's performed.
  Because the reset must happen before any other apps have a chance to
  publish shortcuts, the logic is not straightforward.

- Added an internal API to reset the throttling upon inline-reply
from a notification.

- Stop supporting icons from "content:" URIs
- Improved javadoc on several APIs.

Also internal refactor needed to this:
- ShortcutUser.getAllPackages()/getAllLaunchers() are no longer
accessible to outer code to prevent accidentally adding/removing the
content.  Outer code should use forAllPackages() / forAllLaunchers().

Bug 27923857

Change-Id: I002511193d1d33718163bb1dabe77610bde58198
2016-05-02 12:02:19 -07:00
Todd Kennedy
0b4f8443ab Merge "Restrict updates of system packages" into nyc-dev am: 4e4fca43b0 am: 728b0978e5
am: c5f564a0d6

* commit 'c5f564a0d6179189721ceb1cc05cdaefa35a225c':
  Restrict updates of system packages

Change-Id: I06d7729ddc9ee2fb485ab3a9af88e3a7d26b5718
2016-05-02 15:00:35 +00:00
Todd Kennedy
4e4fca43b0 Merge "Restrict updates of system packages" into nyc-dev 2016-05-02 14:44:20 +00:00
Wale Ogunwale
e777ee2249 Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev am: e7fefcb565 am: 1a9d6ff291
am: 027612d71f

* commit '027612d71f9e50b900cba8b53320a8fe87e6f7f1':
  Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default

Change-Id: I7039b26a64e8a63515de5b42907135e53b2ea97b
2016-04-30 03:39:30 +00:00
Wale Ogunwale
8f6c925ae7 Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default
Previous assumption was ActivityInfo was completely initialized in
PackageParser, but that isn't the case with the ResolverActivity
whose ActivityInfo in populated in PackageManagerService.
This was causing the device to exist multi-window mode since
the default ActivityInfo.resizeMode was 0 (RESIZE_MODE_UNRESIZEABLE).

Bug: 28378995
Change-Id: I46e58d434f2a0274c461a8ff00b59ed3d2a1dd52
2016-04-29 16:46:47 -07:00