Commit Graph

65188 Commits

Author SHA1 Message Date
Svet Ganov
879f5ba3f7 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev am: c947ebd am: 70d720c
am: 13da561

* commit '13da5613e2fce0ca2d5682fd202234856d2206e9':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: Ibe4a6258c6437a9e86ed25e242301ca6d6635d26
2016-04-22 22:35:29 +00:00
Svet Ganov
70d720ca72 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev
am: c947ebd

* commit 'c947ebd66d397782af0870df457ccc4fe83c77cc':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: I50e4c8357bb0c5abab9c37b6a39628f6e3e0ea1b
2016-04-22 22:24:36 +00:00
Svetoslav Ganov
c947ebd66d Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev 2016-04-22 22:18:29 +00:00
Adam Powell
f19c1c6634 Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev am: d2285b1 am: e849829
am: 9aff58d

* commit '9aff58d6204d58c04b4257519f8dfeab1fd00033':
  Remove dependencies on Activity from common Fragment superclasses

Change-Id: I6c6e35c552fb7699e3d44a364f18624b888011df
2016-04-22 22:10:38 +00:00
Adam Powell
e849829569 Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev
am: d2285b1

* commit 'd2285b1f40a714a49602dab5645c194af0eac880':
  Remove dependencies on Activity from common Fragment superclasses

Change-Id: Ic0da5094cae15e03f139eae6ed2760a6cd126e0c
2016-04-22 21:49:30 +00:00
Adam Powell
d2285b1f40 Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev 2016-04-22 21:43:16 +00:00
Svetoslav Ganov
d1bd91aae8 Merge "Disallow disable of the system shared libs." into nyc-dev am: 5a91b61 am: 50d08f8
am: 115ee83

* commit '115ee8340fd0ef4090550f046e2da51f476d32c0':
  Disallow disable of the system shared libs.

Change-Id: I9f96c94d6a0007ea602ef0c923e9079dceff4094
2016-04-22 21:37:28 +00:00
TreeHugger Robot
37d6a74d6c Merge "Merge "Force pinned windows to always be scaleable." into nyc-dev am: e67960e am: 6ce373a" into nyc-mr1-dev-plus-aosp
am: 69a8981

* commit '69a89816f9b7fb016e43e7e68236e37c45e35e42':
  Force pinned windows to always be scaleable.

Change-Id: I40ad7e8fcee70903e0998487ad144c75d39c12f8
2016-04-22 21:33:54 +00:00
Alex Hills
fae5c81aa5 Merge "Changes Message from using parcels to bundles" into nyc-dev am: 9ef0ce1 am: 7bdd6a5
am: a384cda

* commit 'a384cdae6494d60149043ca244b76761c9c27dca':
  Changes Message from using parcels to bundles

Change-Id: Icb2bbe938f13036e51a650e85bee45b741c5004c
2016-04-22 21:30:51 +00:00
Svet Ganov
ae0e03a9e0 Cleanup of the PackageInstaller API - Frameworks
The PackageInstaller app manages side-loading apps as well
as permission management. It should be updatable, hence
should rely on system APIs to talk to the platform. This
is the first step of defining an API boundary.

Change-Id: I9814eafd0b22ae03b4b847a7007cdbf14c9e5466
2016-04-22 14:18:32 -07:00
Svetoslav Ganov
115ee8340f Merge "Disallow disable of the system shared libs." into nyc-dev am: 5a91b61
am: 50d08f8

* commit '50d08f81d7c9e614f2a3f23fd815bbc183419874':
  Disallow disable of the system shared libs.

Change-Id: I689b99c36e7037ef4efbcbccea04be33e442c84e
2016-04-22 21:09:55 +00:00
Svetoslav Ganov
599bf728de Merge "Disallow disable of the system shared libs." into nyc-dev
am: 5a91b61

* commit '5a91b615232374084a45752d7c09c25265e263ed':
  Disallow disable of the system shared libs.

Change-Id: I111c0285b73ffa64594c39b54d18d5d3ff670953
2016-04-22 21:07:11 +00:00
Svetoslav Ganov
5a91b61523 Merge "Disallow disable of the system shared libs." into nyc-dev 2016-04-22 21:03:30 +00:00
Rakesh Iyer
d223fb7136 resolve merge conflicts of 72c0452 to master
Change-Id: I1b9e27569762afe14935d75d35438cbd271c11cb
2016-04-22 13:07:45 -07:00
Robert Carr
6ce373a4c8 Merge "Force pinned windows to always be scaleable." into nyc-dev
am: e67960e

* commit 'e67960ecae2ba008a7d1d364b5fdb1b95a179e52':
  Force pinned windows to always be scaleable.

Change-Id: Ie5faf56b2f9ad25d0d9977970fedb681ca72c628
2016-04-22 19:18:53 +00:00
TreeHugger Robot
e67960ecae Merge "Force pinned windows to always be scaleable." into nyc-dev 2016-04-22 19:13:23 +00:00
Adam Powell
31479e33e6 Remove dependencies on Activity from common Fragment superclasses
Allow common Fragments to be used in non-Activity hosts.

Bug 28337394

Change-Id: Id3baa3ef19ea41ff43ca76be89ced7530fbadfab
2016-04-22 12:11:28 -07:00
Alex Hills
7bdd6a5c87 Merge "Changes Message from using parcels to bundles" into nyc-dev
am: 9ef0ce1

* commit '9ef0ce1749e626a47d669a3f4b059ba748d2e69e':
  Changes Message from using parcels to bundles

Change-Id: If39af54393915b539a7724deda9404cf4d795f36
2016-04-22 19:01:15 +00:00
Alex Hills
49fff88f8a Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev am: cb1f9da am: a6bc9fa
am: 1f2c9f2

* commit '1f2c9f2283287f5f877deb262b30569f072d4af9':
  Adds a BigPicAmbient flag to WearableExtender

Change-Id: Ie53c3fd0b7124cc4ddd92571041669f5a82732f1
2016-04-22 18:49:32 +00:00
Winson
b5726c5963 Merge changes I222e50f6,I9832874d into nyc-dev
am: 6c83c7a

* commit '6c83c7aa5f84680ffd53d3e318279cbead8b1af5':
  Removing legacy calculation of Recents visibility.
  Adding additional dump logging to track down bugs.

Change-Id: I20c8aeb4b943284b2bee2b7d45d3530a5d6dfa06
2016-04-22 18:37:02 +00:00
Alex Hills
a6bc9fa6c2 Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev
am: cb1f9da

* commit 'cb1f9da55b2960f7cabd9c50632f2ac9d8a3311a':
  Adds a BigPicAmbient flag to WearableExtender

Change-Id: I37e02f365854200f34a4d6cad52300e4e0ccd253
2016-04-22 18:36:57 +00:00
Alexander Hills
9ef0ce1749 Merge "Changes Message from using parcels to bundles" into nyc-dev 2016-04-22 18:32:49 +00:00
Winson Chung
6c83c7aa5f Merge changes I222e50f6,I9832874d into nyc-dev
* changes:
  Removing legacy calculation of Recents visibility.
  Adding additional dump logging to track down bugs.
2016-04-22 18:22:02 +00:00
Jeff Hao
e1d41fcc0d Merge "Support to pass <uses-library> option through to dex2oat." 2016-04-22 18:20:13 +00:00
Alexander Hills
cb1f9da55b Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev 2016-04-22 18:11:46 +00:00
Andrei Stingaceanu
203ae48ff7 Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev am: 1a83df8ba7 am: 9e16d11683
am: e0ea2e06ab

* commit 'e0ea2e06abafdde2974b8976ececd727e590060c':
  Keyboard shortcuts: dismiss when activities start via shortcut

Change-Id: Ic86b86c3254318d17059b4650a9c7bcb652bddf3
2016-04-22 17:06:50 +00:00
Andrei Stingaceanu
9e16d11683 Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev
am: 1a83df8ba7

* commit '1a83df8ba716d027ac26c9198ed3d3b8d2b98ad1':
  Keyboard shortcuts: dismiss when activities start via shortcut

Change-Id: I90368ac50ef49535bda0f4babfc80e120fe72f89
2016-04-22 17:01:46 +00:00
Andrei Stingaceanu
1a83df8ba7 Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev 2016-04-22 16:46:31 +00:00
Andres Morales
19284570d8 Merge "FrameMetricsListener API council changes" into nyc-dev am: 82ee675330 am: 2e9c311abd
am: d02093198f

* commit 'd02093198fe84f05c9c062c7a67e26c73aeca41f':
  FrameMetricsListener API council changes

Change-Id: I012b699981d26c6f932c66573b43e8ce93a6e6b0
2016-04-22 16:38:49 +00:00
Andres Morales
2e9c311abd Merge "FrameMetricsListener API council changes" into nyc-dev
am: 82ee675330

* commit '82ee6753305b484d778743882fb827c6b73d82c1':
  FrameMetricsListener API council changes

Change-Id: I8ea921d0f7d4658ee0b9827e9b38637c9d370922
2016-04-22 16:34:17 +00:00
Andres Morales
82ee675330 Merge "FrameMetricsListener API council changes" into nyc-dev 2016-04-22 16:31:21 +00:00
Andrei Stingaceanu
0bf096f1b4 Keyboard shortcuts: dismiss when activities start via shortcut
* introduced a new intent DISMISS_KEYBOARD_SHORTCUTS and
and new public API in Activity (which sends a broadcast
to KeyboardShortcutsReceiver) which applications can
use to dismiss the keyboard shortcuts.

* plumbing and implementation for a new call to dismiss
keyboard shortcuts from PhoneWindowManager and used it:
** when starting activities invoked via Search+key
** when starting activities invoked via META
** when starting activities via application launch keys

* removed unused variable in
Activity#onProvideKeyboardShortcuts

Note that for apps started via touch (aka non-shortcut)
like tapping the Settings gear icon from the notification
bar the menu is not automatically dismissed.

Bug: 28012198
Change-Id: I83a8d4f342bb8a08115a648648834d0d2bac19fd
2016-04-22 16:57:25 +01:00
Bo Liu
ae6139f717 Merge "webview: canInvokeDrawGlFunctor should always return true" into nyc-dev am: 79ec08248a am: 07901c7d1f
am: 4f085f3980

* commit '4f085f39806d5a1200fc860b39347962f7fbb92d':
  webview: canInvokeDrawGlFunctor should always return true

Change-Id: Ieb52c20428b90a766e79db673d3497b9d902346c
2016-04-22 15:45:10 +00:00
Bo Liu
07901c7d1f Merge "webview: canInvokeDrawGlFunctor should always return true" into nyc-dev
am: 79ec08248a

* commit '79ec08248afca69f02e53a2123517fc272e4a27c':
  webview: canInvokeDrawGlFunctor should always return true

Change-Id: I54bfb01a138d68275fd182ee7970b342562adfc8
2016-04-22 15:40:29 +00:00
Bo Liu
79ec08248a Merge "webview: canInvokeDrawGlFunctor should always return true" into nyc-dev 2016-04-22 15:36:38 +00:00
Brian Carlstrom
30d90d1af5 Merge "Add reasons to notifyPackageUse calls" into nyc-dev am: 6894199054 am: eca1026d72
am: 280ca7b83a

* commit '280ca7b83a84f51a80a034c3d28b5185db4c2693':
  Add reasons to notifyPackageUse calls

Change-Id: I89ef19f3278dad1b8dcde147596ec52ef048e5fe
2016-04-22 15:19:59 +00:00
Brian Carlstrom
280ca7b83a Merge "Add reasons to notifyPackageUse calls" into nyc-dev am: 6894199054
am: eca1026d72

* commit 'eca1026d72b0df2d574bd9240940f7cc3ac0a529':
  Add reasons to notifyPackageUse calls

Change-Id: Ifd5510d5016d3735324d9694c4a6c0237c15b678
2016-04-22 15:17:39 +00:00
Brian Carlstrom
c762f82d1a Merge "Add reasons to notifyPackageUse calls" into nyc-dev
am: 6894199054

* commit '68941990541498196fd1a08529fc6df56280fe47':
  Add reasons to notifyPackageUse calls

Change-Id: I454dc388f042a9180da1dab07ce8cf4cf8dbe337
2016-04-22 15:15:25 +00:00
TreeHugger Robot
6894199054 Merge "Add reasons to notifyPackageUse calls" into nyc-dev 2016-04-22 15:00:37 +00:00
Philip P. Moltmann
7cb048c8a5 Merge "Rename \'thousands of an inch\' to \'thousandths of an inch\'in the docs." into nyc-dev am: 10a1a656e2 am: dde611dcd6
am: 82604ed8cc

* commit '82604ed8cc68f87b65654785f1c4b729e76b8d9c':
  Rename 'thousands of an inch' to 'thousandths of an inch'in the docs.

Change-Id: Ifce391490dd013cdad3f3c25cda3421dcd8028dd
2016-04-22 14:25:11 +00:00
Philip P. Moltmann
dde611dcd6 Merge "Rename \'thousands of an inch\' to \'thousandths of an inch\'in the docs." into nyc-dev
am: 10a1a656e2

* commit '10a1a656e2769ce3227db1001a4e69eebe99e6ac':
  Rename 'thousands of an inch' to 'thousandths of an inch'in the docs.

Change-Id: If260e10e9adc7a9ae892008865fec21490f53739
2016-04-22 14:20:38 +00:00
Philip P. Moltmann
10a1a656e2 Merge "Rename 'thousands of an inch' to 'thousandths of an inch'in the docs." into nyc-dev 2016-04-22 14:08:08 +00:00
Brian Carlstrom
ca82e616d3 Add reasons to notifyPackageUse calls
This is so we can record more specific times in PackageUsage.
If file with only one timestamp per package is found, the value is
copied to all usage slots.

Bug: 27902702
Change-Id: I8affe43c735e54620a9204433aad367cfddfded7
2016-04-22 14:39:53 +01:00
Tobias Thierer
ef773e84c6 frameworks/base: Avoid Long object allocations in Long.valueOf() am: 28532d0026
am: 9031ab18fd

* commit '9031ab18fdb0187016998d0e192df12160265b9c':
  frameworks/base: Avoid Long object allocations in Long.valueOf()

Change-Id: I87089a855f76ccbdb086185000f13e803023e67a
2016-04-22 12:58:47 +00:00
Tobias Thierer
28532d0026 frameworks/base: Avoid Long object allocations in Long.valueOf()
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()

Tested: built frameworks/base successfully.

Bug: 28289401
(cherry picked from commit 4bd017d6a5)

Change-Id: Icfa4708946e774f4a1bacf185c3fd11a7087017e
2016-04-22 13:36:53 +01:00
Hugo Benichi
02a28abfd5 Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372 am: cbb0d77bcd
am: 03c0efa3a4

* commit '03c0efa3a4256b19871d6f8d08c4bff5e89aa8bd':
  Split network monitoring and portal probe events

Change-Id: I4cd3eeb25f63fe3731883ec2cc4fbfc3602bfba8
2016-04-22 09:55:38 +00:00
Rubin Xu
7b2d5714bb Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev am: b40667eccd am: 67c7ac2890
am: dfb47299f8

* commit 'dfb47299f8dfffe4d9c8c57af2d83a64e5ed347c':
  Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast

Change-Id: I9154ccdf9b9b7676cd880fa9d956bb246a2cac3c
2016-04-22 09:55:35 +00:00
Hugo Benichi
03c0efa3a4 Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372
am: cbb0d77bcd

* commit 'cbb0d77bcdacc50f130eeb93f9ef2285c6dfcaf9':
  Split network monitoring and portal probe events

Change-Id: I8c1169d61ca526449beb4509005ceae4b3dca51e
2016-04-22 09:53:19 +00:00
Rubin Xu
dfb47299f8 Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev am: b40667eccd
am: 67c7ac2890

* commit '67c7ac289033ac0ba6f55d15e87898aec66175f3':
  Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast

Change-Id: I93c570a6b97910eb759429013393a5b5c50a41b5
2016-04-22 09:53:15 +00:00
Hugo Benichi
06de560179 Merge "Split network monitoring and portal probe events" into nyc-dev
am: 784c93e372

* commit '784c93e372ff8ba8ca59499a8e35d83e5bd71c1a':
  Split network monitoring and portal probe events

Change-Id: I1e9208a9c8cd178ec31edf1755cc82db980b9071
2016-04-22 09:51:01 +00:00