Christopher Tate
3e9f59e862
Merge "Don\'t worry about an extra weak indirection with callback alarms" into nyc-dev
...
am: 0a7ec886c3
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
832775b7f3
Merge "Switched the notification time to relative time" into nyc-dev
...
am: 037235d83e
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
bc27c869b1
Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev
...
am: ee4ee262c6
2016-04-21 23:30:14 +00:00
John Reck
59311fb7c9
Merge "Fix flag value collision" into nyc-dev
...
am: e5cebf7aaa
2016-04-21 23:30:10 +00:00
Adam Powell
ee4ee262c6
Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev
2016-04-21 23:05:03 +00:00
Tim Murray
e5cebf7aaa
Merge "Fix flag value collision" into nyc-dev
2016-04-21 22:59:42 +00:00
John Reck
60e885f672
Fix flag value collision
...
Bug: 28314544
Change-Id: If73c1e8fd0e7b313bccbeffa172bdc3ab9496a43
2016-04-21 15:40:45 -07:00
Selim Cinek
36d570863a
Switched the notification time to relative time
...
The time is now displayed in a relative manner instead
of absolute.
Change-Id: Idcc4411ed07991b6e176c4890a0d804394d8598a
Fixes: 27435284
2016-04-21 15:07:06 -07:00
Christopher Tate
d0cca79f3c
Don't worry about an extra weak indirection with callback alarms
...
Bug 27995384
Change-Id: Ie9cf3e05dca4af7085b479fb65d4cf45ee0239ba
2016-04-21 15:05:34 -07:00
Vladislav Kaznacheev
45b1e14468
Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
...
am: 729c640cc8
2016-04-21 21:43:08 +00:00
Hyunyoung Song
84e85f2e56
Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev
...
am: 44157a4abf
2016-04-21 21:43:04 +00:00
Vladislav Kaznacheev
729c640cc8
Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
2016-04-21 21:34:26 +00:00
Hyunyoung Song
44157a4abf
Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev
2016-04-21 21:32:38 +00:00
Alan Viverette
c27d18d681
Merge "API review feedback for ProgressBar" into nyc-dev
...
am: 5500bb1d6d
2016-04-21 21:27:06 +00:00
Hyunyoung Song
3a93f0ff37
Fix broken build due to @RemotableViewMethod
...
Change-Id: I63c6cb4fa68df114220efb2f263115e773e25f5d
2016-04-21 14:26:54 -07:00
Alan Viverette
5500bb1d6d
Merge "API review feedback for ProgressBar" into nyc-dev
2016-04-21 21:21:56 +00:00
Hyunyoung Song
b99a507ec0
Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev
...
am: 22d91b0eb4
2016-04-21 21:06:24 +00:00
Hyunyoung Song
22d91b0eb4
Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev
2016-04-21 21:04:25 +00:00
Hyunyoung Song
7b77e0c765
add @RemotableViewMethod to TextView#setEnabled
...
b/28304068
Change-Id: Ia5464030a65c87dacdd75e5be331da017d7ef593
2016-04-21 13:41:56 -07:00
Robert Carr
674bedee2e
Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev
...
am: 37696cccd8
2016-04-21 20:01:15 +00:00
Rob Carr
37696cccd8
Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev
2016-04-21 19:52:02 +00:00
Adam Powell
a9bab98d70
Move child FragmentManager shutdown for retained fragments
...
Some apps out there do some creative things in terms of calling their
own onDetach methods from elsewhere. Perform the child FragmentManager
shutdown for retained fragments in a package-level perform method
instead of in onDetach itself.
Also mark all existing fragment methods with @CallSuper.
Bug 28293847
Change-Id: I343b610f8d427fe5cabd523a78fbf0e6f3b34c57
2016-04-21 11:04:41 -07:00
Yohei Yukawa
1f79c0fea1
Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev
...
am: d67a1ca49b
2016-04-21 17:16:19 +00:00
Yohei Yukawa
d67a1ca49b
Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev
2016-04-21 17:11:55 +00:00
Tony Mak
f5f982f014
Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev
...
am: d3589ee715
2016-04-21 15:53:57 +00:00
Tony Mak
646fe9913e
Fix wrong app is launched after solving challenge from tapping notification
...
PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.
Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.
Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix: 28309964
2016-04-21 16:43:08 +01:00
Erik Kline
0f155c5778
Merge "Expand NetworkMonitor metrics" into nyc-dev
...
am: b99d6af3ab
2016-04-21 05:28:30 +00:00
TreeHugger Robot
b99d6af3ab
Merge "Expand NetworkMonitor metrics" into nyc-dev
2016-04-21 05:24:40 +00:00
Hugo Benichi
9fc5843fa8
Merge "Some fixes in ConnectivityService event logging" into nyc-dev
...
am: 7261fb27de
2016-04-21 04:12:56 +00:00
Hugo Benichi
d8a8ea1e29
Merge "Various fixes in IpReachability event logging" into nyc-dev
...
am: 75f0346167
2016-04-21 04:04:01 +00:00
Hugo Benichi
7261fb27de
Merge "Some fixes in ConnectivityService event logging" into nyc-dev
2016-04-21 04:02:55 +00:00
Erik Kline
a488c23dd5
Expand NetworkMonitor metrics
...
- add netid to CaptivePortalStateChangeEvent
- add NetworkMonitorEvent for simple duration measurements
Bug: 28204408
Change-Id: I62035e07d64013878a0bce30c67c929c2c7e7a85
2016-04-21 13:02:55 +09:00
Hugo Benichi
75f0346167
Merge "Various fixes in IpReachability event logging" into nyc-dev
2016-04-21 03:54:18 +00:00
Ruchi Kandoi
fb8c76df29
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
...
am: 316c68f144
2016-04-21 02:46:51 +00:00
Ruchi Kandoi
316c68f144
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
2016-04-21 02:37:50 +00:00
Hugo Benichi
5f16f760ad
Some fixes in ConnectivityService event logging
...
Bug: 28204408
Change-Id: I44ed9539bb213a845c2bcc2861c947af7c3c9ef4
2016-04-21 11:03:08 +09:00
Amith Yamasani
bc25c87c57
Merge "Throw better exception when startVoiceActivity fails" into nyc-dev
...
am: 2be4c463bc
2016-04-21 00:50:10 +00:00
Shreyas Basarge
f153182db7
Merge "Fix logspam by JobInfo" into nyc-dev
...
am: bb9dd3c9fd
2016-04-21 00:50:04 +00:00
TreeHugger Robot
2be4c463bc
Merge "Throw better exception when startVoiceActivity fails" into nyc-dev
2016-04-21 00:46:32 +00:00
Dianne Hackborn
bb9dd3c9fd
Merge "Fix logspam by JobInfo" into nyc-dev
2016-04-21 00:39:43 +00:00
Philip P. Moltmann
458216854a
Merge "Prevent printing from finishing activity." into nyc-dev
...
am: 41304f47f4
2016-04-21 00:34:36 +00:00
Philip P. Moltmann
41304f47f4
Merge "Prevent printing from finishing activity." into nyc-dev
2016-04-21 00:31:42 +00:00
Philip P. Moltmann
a70594be57
Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
...
am: 50a871857d
2016-04-21 00:23:34 +00:00
Ruchi Kandoi
a2689dcf71
fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link
...
Change-Id: Ic12b98cbafcc8c81eadba119ab416a9eddb7214a
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com >
2016-04-20 17:22:27 -07:00
Hugo Benichi
25bf8f5d56
Various fixes in IpReachability event logging
...
- fold IpReachabilityMonitor* classes into a single IpReachabilityEvent.
- only log an event for NUD_FAILED Netlink answers.
- distinguish between NUD_FAILED with or without lost of provisioning.
- do not record host ip addresses.
- record interface name instead of interface index when losing
provisioning.
- also return an error code when probeNeighbor fails, and log this error
code in IpReachability events.
Bug: 28204408
Change-Id: I5f0def0ab1ace7e467a0c69b3b82d07ef2252307
2016-04-21 09:18:50 +09:00
Vladislav Kaznacheev
bd048c598d
Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
...
am: 28609360cf
2016-04-21 00:18:20 +00:00
Eino-Ville Talvala
a6587338ea
Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
...
am: 5856779c3a
2016-04-21 00:17:55 +00:00
Philip P. Moltmann
50a871857d
Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
2016-04-21 00:17:48 +00:00
