Commit Graph

65159 Commits

Author SHA1 Message Date
Jeff Hao
e1d41fcc0d Merge "Support to pass <uses-library> option through to dex2oat." 2016-04-22 18:20:13 +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
Rubin Xu
66bbd99c66 Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev
am: b40667eccd

* commit 'b40667eccdd797d08560c33e696625509f90d52b':
  Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast

Change-Id: I3113934145e7bdf044e731e75295782d1c535f14
2016-04-22 09:50:58 +00:00
TreeHugger Robot
784c93e372 Merge "Split network monitoring and portal probe events" into nyc-dev 2016-04-22 09:41:06 +00:00
Rubin Xu
b40667eccd Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev 2016-04-22 09:25:03 +00:00
Hugo Benichi
cc92c6e877 Split network monitoring and portal probe events
This patches changes how captive portal tests and network lifecycle
events are logged as connectivity events:
  - it splits NetworkMonitorEvent into two event classes:
      - ValidationProbeEvent for logging individual probe events.
      - NetworkEvent for logging network connection, validation,
        lingering, and disconnection.
  - it removes the redundant CaptivePortalCheckResultEvent class.
    The information logged in CaptivePortalCheckResultEvent was already
    logged by NetworkMonitorEvent, but missing the evaluation durations.
    It is now logged by ValidationProbeEvent.
  - it removes the CaptivePortalStateChangeEvent class, which is now
    redundant with NetworkEvent, but missing evaluation durations.

In addition, it adds event logging when ConnectivityService puts a
network into lingering or removes a network from lingering.

Bug: 28204408
Change-Id: I8f9752e4d36175ecfcbd1545a01a41bad6e06ea4
2016-04-22 17:08:56 +09:00
Selim Cinek
b0f63057fc Merge "Fixed a bug where notification header could become empty" into nyc-dev am: 57e4a67be1 am: 0aef73a252
am: c93f4b6707

* commit 'c93f4b67076b683c463ab949d6087b41303bc06c':
  Fixed a bug where notification header could become empty

Change-Id: Ifb5e38f663973c62211249edcccdd0d72c754f1c
2016-04-22 05:46:40 +00:00
Selim Cinek
0aef73a252 Merge "Fixed a bug where notification header could become empty" into nyc-dev
am: 57e4a67be1

* commit '57e4a67be13eede636608f789d1b88d0889683ec':
  Fixed a bug where notification header could become empty

Change-Id: I5c22f22e67ed60ae441adccf852fc3850c400ad5
2016-04-22 05:42:07 +00:00
Selim Cinek
57e4a67be1 Merge "Fixed a bug where notification header could become empty" into nyc-dev 2016-04-22 05:33:33 +00:00
Selim Cinek
65080a64df Merge "Changed the name of chronometer countdown" into nyc-dev am: 8f32cd4306 am: ba26bf8a47
am: 5e2a3e5872

* commit '5e2a3e5872e8439ad836b5b281e6393ecefb50f4':
  Changed the name of chronometer countdown

Change-Id: Ibce68e45c56e90ee66b7a7d2fbfc0350178885fa
2016-04-22 03:47:25 +00:00
Selim Cinek
5e2a3e5872 Merge "Changed the name of chronometer countdown" into nyc-dev am: 8f32cd4306
am: ba26bf8a47

* commit 'ba26bf8a471275520c8a6d97dccd19e6e6993388':
  Changed the name of chronometer countdown

Change-Id: I8c4970cfd2f0f2c8c56647737e1993de65dc1ec7
2016-04-22 03:45:09 +00:00
Selim Cinek
540aa3c8a0 Merge "Changed the name of chronometer countdown" into nyc-dev
am: 8f32cd4306

* commit '8f32cd4306a201c2167c20fc636fe613f1fabd4c':
  Changed the name of chronometer countdown

Change-Id: I2e7040b43c2f46dfc8159d98862e865343df221d
2016-04-22 03:40:33 +00:00
Selim Cinek
8f32cd4306 Merge "Changed the name of chronometer countdown" into nyc-dev 2016-04-22 03:21:52 +00:00
Christopher Tate
055e661706 Merge "Don\'t worry about an extra weak indirection with callback alarms" into nyc-dev am: 0a7ec886c3 am: 3e9f59e862
am: 1fb59e587f

* commit '1fb59e587f95e0235ec7c0827a1d2e163bc8bd44':
  Don't worry about an extra weak indirection with callback alarms

Change-Id: I0e0d4b03f2a15b12e9bcfc6906e949137e3a380c
2016-04-22 00:55:48 +00:00
Christopher Tate
3e9f59e862 Merge "Don\'t worry about an extra weak indirection with callback alarms" into nyc-dev
am: 0a7ec886c3

* commit '0a7ec886c35107c1f8d2d1ff3977ac5dd91fddd1':
  Don't worry about an extra weak indirection with callback alarms

Change-Id: Ifd44a119263b68ff6b67679931c579dcef622d0e
2016-04-22 00:50:56 +00:00
Chris Tate
0a7ec886c3 Merge "Don't worry about an extra weak indirection with callback alarms" into nyc-dev 2016-04-22 00:40:44 +00:00
Selim Cinek
2490b38795 Merge "Switched the notification time to relative time" into nyc-dev am: 037235d83e am: 832775b7f3
am: 22ac656218

* commit '22ac65621885412c1e90594644b98281f36b64e7':
  Switched the notification time to relative time

Change-Id: Ib4a88c9e7b47bc5f9c586cc49a6eb97ad98fe642
2016-04-22 00:23:54 +00:00
Selim Cinek
832775b7f3 Merge "Switched the notification time to relative time" into nyc-dev
am: 037235d83e

* commit '037235d83edcc78aab8798a0b221b6f14d9e15f3':
  Switched the notification time to relative time

Change-Id: I599b7e0c7e4576e04f9409b464fc7b9a3b96c72c
2016-04-22 00:12:16 +00:00
TreeHugger Robot
037235d83e Merge "Switched the notification time to relative time" into nyc-dev 2016-04-21 23:47:23 +00:00
Adam Powell
3cddcd63d0 Merge "Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev am: ee4ee262c6 am: e362a65921" into nyc-mr1-dev-plus-aosp
am: 47074ca3ce

* commit '47074ca3cee75fa176055f884faf51b29301d191':
  Move child FragmentManager shutdown for retained fragments

Change-Id: I723dbab01c5fbb93d4d08382e5cdfbb31b4ac86e
2016-04-21 23:35:06 +00:00
John Reck
be31f33405 Merge "Fix flag value collision" into nyc-dev am: e5cebf7aaa am: bf4e2f742c
am: eaec808ac5

* commit 'eaec808ac5a3cfc82b3d954f00949760b85986ac':
  Fix flag value collision

Change-Id: Ia999f06d58d128e3ab01109ba9a7237957ce4321
2016-04-21 23:34:58 +00:00
Adam Powell
92145a1669 Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev am: ee4ee262c6
am: e362a65921

* commit 'e362a6592134c5684381028f3fdccee6c8b3418a':
  Move child FragmentManager shutdown for retained fragments

Change-Id: I49d915efafe438c62ae3d29c4826799494d7e4cc
2016-04-21 23:32:35 +00:00
Tim Murray
eaec808ac5 Merge "Fix flag value collision" into nyc-dev am: e5cebf7aaa
am: bf4e2f742c

* commit 'bf4e2f742c81c136e4f4a7019026a09dce8a3d98':
  Fix flag value collision

Change-Id: I45d049b899c2171957f8c005267928c07422a411
2016-04-21 23:32:32 +00:00
Adam Powell
bc27c869b1 Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev
am: ee4ee262c6

* commit 'ee4ee262c674cf0a20cf294ecfe4b8736cf6c983':
  Move child FragmentManager shutdown for retained fragments

Change-Id: I4e946a45c375c6af680679fc1415f9ff0ff0f5d1
2016-04-21 23:30:14 +00:00
John Reck
59311fb7c9 Merge "Fix flag value collision" into nyc-dev
am: e5cebf7aaa

* commit 'e5cebf7aaa1a1eaa16bbb8b039a572e19e0a5542':
  Fix flag value collision

Change-Id: I7efb08917bbab1c3594b23fd256ba6fa2e68ba6e
2016-04-21 23:30:10 +00:00
Philip P. Moltmann
823715d656 Rename 'thousands of an inch' to 'thousandths of an inch'in the docs.
Fixes: 28268203
Change-Id: I4246bc7431d1e0ecb75a6d101ba6ccd548567704
2016-04-21 16:29:43 -07:00