OSDN Git Service
Adam Powell [Fri, 22 Apr 2016 21:49:30 +0000 (21:49 +0000)]
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
Adam Powell [Fri, 22 Apr 2016 21:43:15 +0000 (21:43 +0000)]
Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev
Wale Ogunwale [Fri, 22 Apr 2016 21:30:49 +0000 (21:30 +0000)]
Merge "Fixed NPE during boot animation on fugu." into nyc-dev
am:
a1e7be3
* commit '
a1e7be375e618544e22287d0ee59f517536f95e1':
Fixed NPE during boot animation on fugu.
Change-Id: I7ad54794f82d8b2ebdaa0d57668295f42642abdd
TreeHugger Robot [Fri, 22 Apr 2016 21:23:52 +0000 (21:23 +0000)]
Merge "Fixed NPE during boot animation on fugu." into nyc-dev
Svetoslav Ganov [Fri, 22 Apr 2016 21:07:11 +0000 (21:07 +0000)]
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
Svetoslav Ganov [Fri, 22 Apr 2016 21:03:28 +0000 (21:03 +0000)]
Merge "Disallow disable of the system shared libs." into nyc-dev
Sujith Ramakrishnan [Fri, 22 Apr 2016 21:02:04 +0000 (21:02 +0000)]
Merge "Unbundle RemoteService on TV - part 3" into nyc-dev
am:
7981e8f
* commit '
7981e8ff6509769a590f15b440f989437d732be5':
Unbundle RemoteService on TV - part 3
Change-Id: Ib5eb6363e904a1f66000d12263f66a8e5bd1f663
Sudheer Shanka [Fri, 22 Apr 2016 21:02:01 +0000 (21:02 +0000)]
Merge "Remove debug flag for some important logs." into nyc-dev
am:
b7ba766
* commit '
b7ba766352ca78784831e7332dd59aa2f0e2a314':
Remove debug flag for some important logs.
Change-Id: I72b6e551ddc7f87a585d33cb7a6e03b74cb1b5f7
Sujith Ramakrishnan [Fri, 22 Apr 2016 20:59:06 +0000 (20:59 +0000)]
Merge "Unbundle RemoteService on TV - part 3" into nyc-dev
Sudheer Shanka [Fri, 22 Apr 2016 20:56:44 +0000 (20:56 +0000)]
Merge "Remove debug flag for some important logs." into nyc-dev
Adrian Roos [Fri, 22 Apr 2016 20:30:01 +0000 (20:30 +0000)]
Merge "Fix IME for status bar in docked mode" into nyc-dev
am:
93536af
* commit '
93536af56d70c516760a796a1731237acce14f54':
Fix IME for status bar in docked mode
Change-Id: Ifdf6f05b5c59029f6290e90bffd2c97f80fec142
TreeHugger Robot [Fri, 22 Apr 2016 20:22:21 +0000 (20:22 +0000)]
Merge "Fix IME for status bar in docked mode" into nyc-dev
Yang Ni [Fri, 22 Apr 2016 19:52:18 +0000 (19:52 +0000)]
Merge "Fixed BaseObj finalizer and destroy()" into nyc-dev
am:
8ca7638
* commit '
8ca763803d8960ddc9f6c498c3294e69aac0f7cf':
Fixed BaseObj finalizer and destroy()
Change-Id: Id607034269102c84d673b7148beb0b050121e0bc
Wale Ogunwale [Fri, 22 Apr 2016 19:52:16 +0000 (19:52 +0000)]
Merge "Reconfigure display info. after configuration changes." into nyc-dev
am:
10f4f44
* commit '
10f4f44efe0eeb47ea63471c221d7a765f55e3ae':
Reconfigure display info. after configuration changes.
Change-Id: Ie301b0c3cdd5b40c6e9f559b30770fe046145f43
Yang Ni [Fri, 22 Apr 2016 19:48:32 +0000 (19:48 +0000)]
Merge "Fixed BaseObj finalizer and destroy()" into nyc-dev
Wale Ogunwale [Fri, 22 Apr 2016 19:11:51 +0000 (12:11 -0700)]
Fixed NPE during boot animation on fugu.
- Don't set a dim layer in the docked controller if we are not dimming.
- Check to make sure the docked divider window isn't null before trying
to use its layer for dimming.
Bug:
28339915
Change-Id: I33d49d26ffcaec63d135f82a6208e127ba0f0570
TreeHugger Robot [Fri, 22 Apr 2016 19:42:51 +0000 (19:42 +0000)]
Merge "Reconfigure display info. after configuration changes." into nyc-dev
Sujith Ramakrishnan [Fri, 29 Jan 2016 00:53:16 +0000 (16:53 -0800)]
Unbundle RemoteService on TV - part 3
- New service TVRemoteService triggered by SystemServer
- Provider service proxy and watcher for maintaining connections to unbundled
services which have the BIND_TV_REMOTE_SERVICE permission.
- Shared library to facilitate connections between unbundled service and
TVRemoteService.
- Unbundled service needs TV_VIRTUAL_REMOTE_CONTROLLER
permission to be fully functional.
b/
23792608
Change-Id: Ief5c6995883d1f7268a73bdd0c920c4c3f42cddb
Robert Carr [Fri, 22 Apr 2016 19:18:53 +0000 (19:18 +0000)]
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
Junda Liu [Fri, 22 Apr 2016 19:18:50 +0000 (19:18 +0000)]
Merge "Add comments to apptype and authtype constants." into nyc-dev
am:
cc69bed
* commit '
cc69bed61fadd99627751b6e04e99f2c42ef3025':
Add comments to apptype and authtype constants.
Change-Id: Ie7f2d97b7ac79d31bac8b77d0a8056f4c13cc5b7
Chong Zhang [Fri, 22 Apr 2016 19:18:47 +0000 (19:18 +0000)]
Merge "Fix black frame in finishing transition" into nyc-dev
am:
cffe389
* commit '
cffe389a22cf3f3d63ec37a591b0d6226e1db99e':
Fix black frame in finishing transition
Change-Id: I23e2deb5a2e3d6a6b285b327b5c3b0ea48790b37
Michael Wright [Fri, 22 Apr 2016 19:18:43 +0000 (19:18 +0000)]
Merge "Add ambient light ring buffer for initial data gathering period." into nyc-dev
am:
ea999ac
* commit '
ea999ac8e4d1e89eb79c11a76f30a4b25260b243':
Add ambient light ring buffer for initial data gathering period.
Change-Id: I4b80838f0cd00908ea9c81183580860692d5fbff
Sudheer Shanka [Fri, 22 Apr 2016 19:13:30 +0000 (12:13 -0700)]
Remove debug flag for some important logs.
Bug:
27689631
Change-Id: I23c1396f3b29093e6d23ec06f90a382b6ce458d3
TreeHugger Robot [Fri, 22 Apr 2016 19:13:22 +0000 (19:13 +0000)]
Merge "Force pinned windows to always be scaleable." into nyc-dev
Adam Powell [Fri, 22 Apr 2016 18:27:31 +0000 (11:27 -0700)]
Remove dependencies on Activity from common Fragment superclasses
Allow common Fragments to be used in non-Activity hosts.
Bug
28337394
Change-Id: Id3baa3ef19ea41ff43ca76be89ced7530fbadfab
Junda Liu [Fri, 22 Apr 2016 19:05:33 +0000 (19:05 +0000)]
Merge "Add comments to apptype and authtype constants." into nyc-dev
Chong Zhang [Fri, 22 Apr 2016 19:01:56 +0000 (19:01 +0000)]
Merge "Fix black frame in finishing transition" into nyc-dev
Alex Hills [Fri, 22 Apr 2016 19:01:15 +0000 (19:01 +0000)]
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
TreeHugger Robot [Fri, 22 Apr 2016 19:00:23 +0000 (19:00 +0000)]
Merge "Add ambient light ring buffer for initial data gathering period." into nyc-dev
Adrian Roos [Fri, 22 Apr 2016 03:59:47 +0000 (20:59 -0700)]
Fix IME for status bar in docked mode
If the dock divider is visible, window manager raises the IME from the
app's layer on top of the divider. However if the IME was targeting the
status bar, it would also remove it from the status bar's layer and
move it atop the divider (but below the status bar).
To fix this, we now only perform the adjustment to the IME's layer if
that moves the IME up, but never down.
Change-Id: I1308f51b98fffee64a5075c49697f5bc177ea32e
Fixes:
28024606
Chong Zhang [Fri, 22 Apr 2016 18:31:51 +0000 (11:31 -0700)]
Fix black frame in finishing transition
If either visible or nowVisible is true we need to wait for next
activity to become visible before we destroy the previous activity.
In some code path (eg. clear task top), when starting a new activity,
old activity is first paused and visible set to false with a dummy
transition set. Then finish activity is requested. At this point visible
is already false, but nowVisible is true. We still need to wait for
next app become visible to avoid a black frame shown in between.
bug:
27796252
Change-Id: Ief3d5fc8f11c51a729c424f996ab2597c815e4dd
Winson [Fri, 22 Apr 2016 18:37:02 +0000 (18:37 +0000)]
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
Jason Monk [Fri, 22 Apr 2016 18:37:00 +0000 (18:37 +0000)]
Merge "Add strings for quick settings accessibility" into nyc-dev
am:
ab629fc
* commit '
ab629fcc8506ecde2f2a05231c82600281ffa9c2':
Add strings for quick settings accessibility
Change-Id: I6c1cd92abfc879dc0cd67b931e56b0e72e4ef21b
Alex Hills [Fri, 22 Apr 2016 18:36:57 +0000 (18:36 +0000)]
Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev
am:
cb1f9da
* commit '
cb1f9da55b2960f7cabd9c50632f2ac9d8a3311a':
Adds a BigPicAmbient flag to WearableExtender
Change-Id: I37e02f365854200f34a4d6cad52300e4e0ccd253
Alexander Hills [Fri, 22 Apr 2016 18:32:48 +0000 (18:32 +0000)]
Merge "Changes Message from using parcels to bundles" into nyc-dev
Winson Chung [Fri, 22 Apr 2016 18:22:00 +0000 (18:22 +0000)]
Merge changes I222e50f6,I9832874d into nyc-dev
* changes:
Removing legacy calculation of Recents visibility.
Adding additional dump logging to track down bugs.
Wale Ogunwale [Fri, 22 Apr 2016 16:15:09 +0000 (09:15 -0700)]
Reconfigure display info. after configuration changes.
Some of the information reported for a display is dependent on resources to do
the right calculations. For example, {@link DisplayInfo#smallestNominalAppWidth}
and company are dependent on the height and width of the status and nav bar
which change depending on the current configuration.
Bug:
28182307
Change-Id: I2ba5de4bcfb3fa3ad334e69eb192bd15f8f7ebb2
Jason Monk [Fri, 22 Apr 2016 18:13:18 +0000 (18:13 +0000)]
Merge "Add strings for quick settings accessibility" into nyc-dev
Alexander Hills [Fri, 22 Apr 2016 18:11:44 +0000 (18:11 +0000)]
Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev
Jason Monk [Fri, 22 Apr 2016 18:08:27 +0000 (14:08 -0400)]
Add strings for quick settings accessibility
Bug:
15696340
Change-Id: Ie775c90c9fed8078f4db4bde5752a2f2d7f94f25
Dongwon Kang [Fri, 22 Apr 2016 18:00:41 +0000 (18:00 +0000)]
Merge "TIF: Address API review comments" into nyc-dev
am:
b0df08598c
* commit '
b0df08598c9005938a8315a76c148967e6e06fc4':
TIF: Address API review comments
Change-Id: I9e493f4bbee4cf6cd6382fb0539c357083c23617
Dongwon Kang [Fri, 22 Apr 2016 17:54:31 +0000 (17:54 +0000)]
Merge "TIF: Address API review comments" into nyc-dev
Philip P. Moltmann [Fri, 22 Apr 2016 17:48:37 +0000 (17:48 +0000)]
Merge "Send update notifications when the status of a print job updates and make sure to only access mPrintServicesChangeListenerRecords when locked." into nyc-dev
am:
bfce110c63
* commit '
bfce110c63541f514c865fc221047b8101932d58':
Send update notifications when the status of a print job updates and make sure to only access mPrintServicesChangeListenerRecords when locked.
Change-Id: I6d87b7de3325d330b7b03f838ea8ec9475ff85be
Garfield, Tan [Fri, 22 Apr 2016 17:47:31 +0000 (17:47 +0000)]
Merge "DO NOT MERGE: Disable drag n\' drop in DocumentsActivity." into nyc-dev
am:
6e685dc3c5
* commit '
6e685dc3c519526a0f38ec5ee9e81e1f57e0fa36':
DO NOT MERGE: Disable drag n' drop in DocumentsActivity.
Change-Id: I1ae95e8e373ae2883eb923e6a416bedb0218275a
Philip P. Moltmann [Fri, 22 Apr 2016 17:32:36 +0000 (17:32 +0000)]
Merge "Send update notifications when the status of a print job updates and make sure to only access mPrintServicesChangeListenerRecords when locked." into nyc-dev
Yang Ni [Thu, 21 Apr 2016 04:26:24 +0000 (21:26 -0700)]
Fixed BaseObj finalizer and destroy()
Bug:
28242626
Bug:
27972184
Bug:
27973681
This is resolving issues in ScriptGroup (V1) again.
In ScriptGroup.destroy(), we also need to consider the old API where
mClosures is not initialized.
Also cleaned up the finalizer for ScriptGroup and Allocation:
Since BaseObj.finalize() calls BaseObj.helpDestroy(), instead of
BaseObj.destroy(), there is no possibility that the finalizers of
child objects may race their parents finalizers. Note that
helpDestroy() does not try to recurse on child objects.
Change-Id: I9dbb2b60f8478f656f8a418c2b5fc8d6848aeef0
Michael Wright [Fri, 22 Apr 2016 05:03:09 +0000 (01:03 -0400)]
Add ambient light ring buffer for initial data gathering period.
We're seeing reports of the display being too dim at initial wake up.
Saving the buffer for this initial period lets determine whether this
is a calculation error or something wrong with the sensor readings.
Bug:
27951906
Change-Id: I96b5dd0772de056c3c5e54d59c13d1a3d902d343
Garfield Tan [Fri, 22 Apr 2016 17:17:14 +0000 (17:17 +0000)]
Merge "DO NOT MERGE: Disable drag n' drop in DocumentsActivity." into nyc-dev
Andrei Stingaceanu [Fri, 22 Apr 2016 17:01:46 +0000 (17:01 +0000)]
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
Andrei Stingaceanu [Fri, 22 Apr 2016 16:46:29 +0000 (16:46 +0000)]
Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev
Andres Morales [Fri, 22 Apr 2016 16:34:17 +0000 (16:34 +0000)]
Merge "FrameMetricsListener API council changes" into nyc-dev
am:
82ee675330
* commit '
82ee6753305b484d778743882fb827c6b73d82c1':
FrameMetricsListener API council changes
Change-Id: I8ea921d0f7d4658ee0b9827e9b38637c9d370922
Andres Morales [Fri, 22 Apr 2016 16:31:18 +0000 (16:31 +0000)]
Merge "FrameMetricsListener API council changes" into nyc-dev
Andrii Kulian [Fri, 22 Apr 2016 16:20:01 +0000 (16:20 +0000)]
Merge "Show recents when task moves to docked stack" into nyc-dev
am:
82e5288ee6
* commit '
82e5288ee63c92d3a610fd5c50bad510917fbf63':
Show recents when task moves to docked stack
Change-Id: Ie94955f019378eb56d602186c7c803322d59a729
Andrii Kulian [Fri, 22 Apr 2016 16:15:07 +0000 (16:15 +0000)]
Merge "Show recents when task moves to docked stack" into nyc-dev
Andrii Kulian [Thu, 21 Apr 2016 01:43:01 +0000 (18:43 -0700)]
Show recents when task moves to docked stack
When task was moved to docked stack using adb command,
recents didn't show and docked stack was minimized when
home task obtained focus.
This CL shows recents if needed when task is moved to
docked stack.
Bug:
28215216
Change-Id: If1cfb9d24bd77cc9c3c8fad3479f115d7aca1301
Andrei Stingaceanu [Thu, 14 Apr 2016 17:11:57 +0000 (18:11 +0100)]
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
Jason Monk [Fri, 22 Apr 2016 15:54:15 +0000 (15:54 +0000)]
Merge "Add back elevation to quick settings" into nyc-dev
am:
ca2ce9b74a
* commit '
ca2ce9b74aba25692762fa625a1fd2894a62534b':
Add back elevation to quick settings
Change-Id: Ic784f4803ee59201709766171b41cbec4c43abbd
Jason Monk [Fri, 22 Apr 2016 15:47:30 +0000 (15:47 +0000)]
Merge "Add back elevation to quick settings" into nyc-dev
Bo Liu [Fri, 22 Apr 2016 15:40:29 +0000 (15:40 +0000)]
Merge "webview: canInvokeDrawGlFunctor should always return true" into nyc-dev
am:
79ec08248a
* commit '
79ec08248afca69f02e53a2123517fc272e4a27c':
webview: canInvokeDrawGlFunctor should always return true
Change-Id: I54bfb01a138d68275fd182ee7970b342562adfc8
Selim Cinek [Fri, 22 Apr 2016 15:40:27 +0000 (15:40 +0000)]
Merge "Fixed a bug where notifications could overlap" into nyc-dev
am:
33e2fc481c
* commit '
33e2fc481c05e0f9c956fc81a999a2b704c21564':
Fixed a bug where notifications could overlap
Change-Id: Iae3ac699b1a1ce5d6cb01cba2465387a0dab702b
Bo Liu [Fri, 22 Apr 2016 15:36:37 +0000 (15:36 +0000)]
Merge "webview: canInvokeDrawGlFunctor should always return true" into nyc-dev
TreeHugger Robot [Fri, 22 Apr 2016 15:16:05 +0000 (15:16 +0000)]
Merge "Fixed a bug where notifications could overlap" into nyc-dev
Android Build Merger (Role) [Fri, 22 Apr 2016 15:15:49 +0000 (15:15 +0000)]
Merge "Merge "Add reasons to notifyPackageUse calls" into nyc-dev am:
6894199054" into nyc-dev-plus-aosp
Brian Carlstrom [Fri, 22 Apr 2016 15:15:25 +0000 (15:15 +0000)]
Merge "Add reasons to notifyPackageUse calls" into nyc-dev
am:
6894199054
* commit '
68941990541498196fd1a08529fc6df56280fe47':
Add reasons to notifyPackageUse calls
Change-Id: I454dc388f042a9180da1dab07ce8cf4cf8dbe337
Tobias Thierer [Fri, 22 Apr 2016 15:09:53 +0000 (16:09 +0100)]
resolve merge conflicts of
9d1357c to nyc-dev-plus-aosp
Change-Id: Ifc9ed03cca4d751fd1fcc9d0572369a49d64a9ad
TreeHugger Robot [Fri, 22 Apr 2016 15:00:36 +0000 (15:00 +0000)]
Merge "Add reasons to notifyPackageUse calls" into nyc-dev
Tobias Thierer [Fri, 22 Apr 2016 14:54:48 +0000 (14:54 +0000)]
Merge "Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL)."
am:
1b33b45038
* commit '
1b33b450381855a6403a577a2613093c578d6754':
Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL).
Change-Id: If82fea1bcf30adf8412becbb13aa599837d00a57
Tobias Thierer [Fri, 22 Apr 2016 14:43:52 +0000 (14:43 +0000)]
Merge "Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL)."
Philip P. Moltmann [Fri, 22 Apr 2016 14:20:38 +0000 (14:20 +0000)]
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
Philip P. Moltmann [Fri, 22 Apr 2016 14:08:07 +0000 (14:08 +0000)]
Merge "Rename 'thousands of an inch' to 'thousandths of an inch'in the docs." into nyc-dev
Brian Carlstrom [Wed, 20 Apr 2016 06:16:08 +0000 (23:16 -0700)]
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
Tobias Thierer [Thu, 21 Apr 2016 13:52:10 +0000 (14:52 +0100)]
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
4bd017d6a5437f153b2b0a149a5dde0b85bf6907)
Change-Id: Icfa4708946e774f4a1bacf185c3fd11a7087017e
Victor Chang [Fri, 22 Apr 2016 11:06:54 +0000 (11:06 +0000)]
Merge "Deleting lock screen clears all CA approvals" into nyc-dev
am:
c0440e5f4d
* commit '
c0440e5f4dfa695d2347c68bbec787d3e16847eb':
Deleting lock screen clears all CA approvals
Change-Id: I692e07ace66056c2469a9c217fedfe96b4290b7d
Victor Chang [Fri, 22 Apr 2016 11:02:41 +0000 (11:02 +0000)]
Merge "Deleting lock screen clears all CA approvals" into nyc-dev
Tobias Thierer [Fri, 22 Apr 2016 10:47:33 +0000 (10:47 +0000)]
Merge "frameworks/base: Avoid Long object allocations in Long.valueOf()" am:
09ae4931a9
am:
8e9bd59555 -s ours
* commit '
8e9bd59555d04700eb1bb6d599fb93df3a5617e6':
frameworks/base: Avoid Long object allocations in Long.valueOf()
Change-Id: Icb01e084e63ce01579ca428795f3a4d330ff9a12
Tobias Thierer [Fri, 22 Apr 2016 10:42:36 +0000 (10:42 +0000)]
Merge "frameworks/base: Avoid Long object allocations in Long.valueOf()"
am:
09ae4931a9
* commit '
09ae4931a98cb0cb7edac257db30169098ab56c7':
frameworks/base: Avoid Long object allocations in Long.valueOf()
Change-Id: I23e77831c7f167da8329143710cd9c4fb389df0e
Tobias Thierer [Fri, 22 Apr 2016 10:27:26 +0000 (10:27 +0000)]
Merge "frameworks/base: Avoid Long object allocations in Long.valueOf()"
Hugo Benichi [Fri, 22 Apr 2016 09:51:01 +0000 (09:51 +0000)]
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
Rubin Xu [Fri, 22 Apr 2016 09:50:58 +0000 (09:50 +0000)]
Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev
am:
b40667eccd
* commit '
b40667eccdd797d08560c33e696625509f90d52b':
Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast
Change-Id: I3113934145e7bdf044e731e75295782d1c535f14
TreeHugger Robot [Fri, 22 Apr 2016 09:41:04 +0000 (09:41 +0000)]
Merge "Split network monitoring and portal probe events" into nyc-dev
Rubin Xu [Fri, 22 Apr 2016 09:25:02 +0000 (09:25 +0000)]
Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev
Rebecca Silberstein [Fri, 22 Apr 2016 08:46:21 +0000 (08:46 +0000)]
Merge changes from topic \'blockOnProcessingUnsolicited\' into nyc-dev
am:
ff0ff67ecc
* commit '
ff0ff67eccd784ccdd35b91ed182c50bb8df2d71':
Tethering: interface updates can be handled again
NativeDaemonConnector: add waitForCallbacks method
Change-Id: If5ac7034911298c8a3f046403d740c7f6dadadec
Selim Cinek [Thu, 21 Apr 2016 23:14:46 +0000 (16:14 -0700)]
Fixed a bug where notifications could overlap
If the expanded child was smaller then the collapsed one
the UI could get very weird. We're now measuring the expanded
version at least as big as the collapsed one.
Change-Id: Ibb99c4926121b2affcc181071b5e439f23c8e4f2
Fixes:
28318145
Fixes:
28015447
Lorenzo Colitti [Fri, 22 Apr 2016 08:41:08 +0000 (08:41 +0000)]
Merge changes from topic 'blockOnProcessingUnsolicited' into nyc-dev
* changes:
Tethering: interface updates can be handled again
NativeDaemonConnector: add waitForCallbacks method
Rebecca Silberstein [Thu, 21 Apr 2016 22:50:34 +0000 (15:50 -0700)]
Tethering: interface updates can be handled again
When reloading wifi firmware, unsolicited responses from netd were
processed after softap had started and caused wifi tethering to be torn
down.
The NetworkManagementServer.wifiFirmwareReload call has been changed to
not only block for the command to finish, but also until all unsolicited
messages (interface updates) have been handled. We should now be able
to handle interface updates in tethering without suffering from the
softap bringup/interface down notification race condition.
BUG:
27857665
Change-Id: Ie57cb8f760781b3227df575b577b33667070d63e
Hugo Benichi [Thu, 21 Apr 2016 06:02:38 +0000 (15:02 +0900)]
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
Selim Cinek [Fri, 22 Apr 2016 07:47:55 +0000 (07:47 +0000)]
Merge "Fixed a bug where the icon of children could be colored" into nyc-dev
am:
d212cfa107
* commit '
d212cfa107948adc986a179deb79aa6b62709b63':
Fixed a bug where the icon of children could be colored
Change-Id: I69703a99a16700389f057f6277a5da7ca3c5e8f1
TreeHugger Robot [Fri, 22 Apr 2016 07:28:30 +0000 (07:28 +0000)]
Merge "Fixed a bug where the icon of children could be colored" into nyc-dev
Rebecca Silberstein [Thu, 21 Apr 2016 19:14:41 +0000 (12:14 -0700)]
NativeDaemonConnector: add waitForCallbacks method
Add a method that allows callers to wait until all unsolicited
responses received from the native daemon during a command are
processed.
When commands are issued to a native daemon (such as netd) through the
NativeDaemonConnector we block until the command response is received.
Any responses or events that are a side-effect (considered
"unsolicited") of the command are placed in a Message and handled as
callbacks. The order of their processing is not guaranteed and, as we
have seen from bugreports, can be handled several seconds
later - causing the SoftAP that was just set up to be torn down
because a late interface down/removed is indistinguishable from a
new interface down/removed.
This CL adds a method that first checks to make sure callback thread
is not the same thread as used for the blocking call. The new
waitForCallbacks method uses a CountDownLatch to force the calling
thread to wait until all unsolicited responses received from the
native daemon during the execution of the command are handled.
The wifiFirmwareReload method is also updated to use the new
waitForCallbacks method.
BUG:
27857665
Change-Id: I3e22978f720b1cbf57fbb64ad4fea73f8c2d408a
Selim Cinek [Fri, 22 Apr 2016 05:42:07 +0000 (05:42 +0000)]
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
Selim Cinek [Fri, 22 Apr 2016 05:33:31 +0000 (05:33 +0000)]
Merge "Fixed a bug where notification header could become empty" into nyc-dev
Jorim Jaggi [Fri, 22 Apr 2016 04:14:17 +0000 (04:14 +0000)]
Merge "Fix signal cluster animation leak" into nyc-dev
am:
8891ae1f7f
* commit '
8891ae1f7f69a1d1b203477bea01674c98af1141':
Fix signal cluster animation leak
Change-Id: Ib0bec1c5cfaf375eba525813e7c43d0a6278e7ab
Jorim Jaggi [Fri, 22 Apr 2016 04:09:11 +0000 (04:09 +0000)]
Merge "Fix signal cluster animation leak" into nyc-dev
Selim Cinek [Fri, 22 Apr 2016 03:40:36 +0000 (03:40 +0000)]
Merge "Fixed a crash when the heads up content view was null" into nyc-dev
am:
841e4946bf
* commit '
841e4946bf3f6cbbc4a84d849de675f1d6296a02':
Fixed a crash when the heads up content view was null
Change-Id: I093f6a7ead9920f53d539437611174ffebd998cd
Selim Cinek [Fri, 22 Apr 2016 03:40:33 +0000 (03:40 +0000)]
Merge "Changed the name of chronometer countdown" into nyc-dev
am:
8f32cd4306
* commit '
8f32cd4306a201c2167c20fc636fe613f1fabd4c':
Changed the name of chronometer countdown
Change-Id: I2e7040b43c2f46dfc8159d98862e865343df221d
Jorim Jaggi [Fri, 22 Apr 2016 03:33:44 +0000 (20:33 -0700)]
Fix signal cluster animation leak
When subscription id's change during the animation, make sure to
clear them out as well. This happens when doing a network switch
on Fi.
Bug:
27434767
Change-Id: I9cbd65888419ca630e884c51d41a0d785237f35b
Selim Cinek [Fri, 22 Apr 2016 03:22:12 +0000 (03:22 +0000)]
Merge "Fixed a crash when the heads up content view was null" into nyc-dev
Selim Cinek [Fri, 22 Apr 2016 03:21:50 +0000 (03:21 +0000)]
Merge "Changed the name of chronometer countdown" into nyc-dev
Erik Kline [Fri, 22 Apr 2016 03:21:51 +0000 (03:21 +0000)]
Merge "IpManager,DhcpClient: catch some errors and better logging" into nyc-dev
am:
5486aabc74
* commit '
5486aabc747501da868985a9df5e4d24d2395fda':
IpManager,DhcpClient: catch some errors and better logging
Change-Id: I6f61c3bb55124355188dafe7370406c06720b6f9
Jorim Jaggi [Fri, 22 Apr 2016 03:21:49 +0000 (03:21 +0000)]
Merge "Fix squished UI elements" into nyc-dev
am:
42a6dc9bd6
* commit '
42a6dc9bd6cd5028ab65f456fe7cc4d8a7fd77c8':
Fix squished UI elements
Change-Id: I73585393914b3dd6be455592f4c9e96190e56b9c