OSDN Git Service
Paul Jensen [Fri, 10 Jul 2015 17:34:18 +0000 (17:34 +0000)]
am
3b9ce37b: Fix build break.
* commit '
3b9ce37b51dcc7729489701d4e797fe91f2ef559':
Fix build break.
Paul Jensen [Fri, 10 Jul 2015 17:34:00 +0000 (17:34 +0000)]
am
bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev
* commit '
bbce221eecdf54317dd0655e5f3507b82db4bfc1':
Fallback to Cellular if WiFi fails to validate
Paul Jensen [Fri, 10 Jul 2015 17:33:51 +0000 (17:33 +0000)]
am
d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev
* commit '
d8cdba0d711f5956475b043a50a6041075157c77':
Prepare some ConnectivityService logic for fallback to Cellular change
Paul Jensen [Fri, 10 Jul 2015 17:33:43 +0000 (17:33 +0000)]
am
00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
* commit '
00c64f7ca5b05384dc3c208eff43e0b1a037a7d0':
Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
Tom Hudson [Fri, 10 Jul 2015 17:33:27 +0000 (17:33 +0000)]
am
9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev
* commit '
9613e9b76410b15b7f2700080a17476bf9f3461c':
New setLocalMatrix() operation for HWUI
Bart Sears [Fri, 10 Jul 2015 17:00:23 +0000 (17:00 +0000)]
Svetoslav [Fri, 10 Jul 2015 17:00:15 +0000 (17:00 +0000)]
am
664251a2: Merge "Fix build" into mnc-dev
* commit '
664251a2fd16e63762be2ca93f2559dc2b134726':
Fix build
Bart Sears [Fri, 10 Jul 2015 17:00:04 +0000 (17:00 +0000)]
am
1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev
* commit '
1aa4049286e7ed1272ce84619f41c13a4d217395':
Revert "Security: AccountChooser shouldn't auto reveal accounts."
Eino-Ville Talvala [Fri, 10 Jul 2015 16:59:57 +0000 (16:59 +0000)]
am
a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev
* commit '
a2cd9c56f8648b5a4faee14d9dd0c4151730f78c':
Camera2: Reorganize high-speed recording API slightly
Paul Jensen [Fri, 10 Jul 2015 16:19:38 +0000 (12:19 -0400)]
Fix build break.
Automatic merge commit caused breakage due to someone else's
intervening change adding a call site of a function whose last
parameter I removed. Function in question is
ConnectivityService.rematchAllNetworksAndRequests.
Changes that merged badly are
85cf78e and
8d48252.
Change-Id: I8fd32e1a187236a65c1b7c0ecdf17b817d108fd0
Paul Jensen [Fri, 10 Jul 2015 15:51:35 +0000 (15:51 +0000)]
Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev
Paul Jensen [Fri, 10 Jul 2015 15:51:21 +0000 (15:51 +0000)]
Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev
Paul Jensen [Fri, 10 Jul 2015 14:57:09 +0000 (14:57 +0000)]
Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
Tom Hudson [Fri, 10 Jul 2015 12:35:10 +0000 (12:35 +0000)]
Merge "New setLocalMatrix() operation for HWUI" into mnc-dev
Bart Sears [Fri, 10 Jul 2015 04:06:27 +0000 (21:06 -0700)]
Fix the build.
Correct a typo.
Change-Id: I16131cf7c0ce17fa09dedc67264e8199482cd27e
Svetoslav [Fri, 10 Jul 2015 03:31:53 +0000 (03:31 +0000)]
Merge "Fix build" into mnc-dev
Svetoslav [Fri, 10 Jul 2015 03:19:41 +0000 (20:19 -0700)]
Fix build
Change-Id: I1b56c07aa5b85662f25158156d2c0eff115e9544
Bart Sears [Fri, 10 Jul 2015 03:15:48 +0000 (03:15 +0000)]
Merge "Revert "Security: AccountChooser shouldn't auto reveal accounts."" into mnc-dev
Eino-Ville Talvala [Fri, 10 Jul 2015 03:14:29 +0000 (03:14 +0000)]
Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev
Baligh Uddin [Fri, 10 Jul 2015 03:01:47 +0000 (03:01 +0000)]
Revert "Security: AccountChooser shouldn't auto reveal accounts."
This reverts commit
c3b3f46d5fcbd89deeb557556e5a695c3e5349a1.
Change-Id: I6d156e1ad82c052606f76644fe6085f14e82a734
David Friedman [Fri, 10 Jul 2015 01:52:55 +0000 (01:52 +0000)]
am
becb4164: am
a70109e4: am
019a0943: Docs: Fixes a typo.
* commit '
becb4164d8a28664d89b655aa5b53f7738f98986':
Docs: Fixes a typo.
Dirk Dougherty [Fri, 10 Jul 2015 01:52:46 +0000 (01:52 +0000)]
am
d75391e0: am
8d56096b: am
f739ad7f: Fix typos in preview support.
* commit '
d75391e09363fdd0f3e2dfec9bf41c3b1e021f90':
Fix typos in preview support.
Carlos Valdivia [Fri, 10 Jul 2015 01:45:31 +0000 (01:45 +0000)]
am
319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev
* commit '
319883c80e13ca980b2721a947805cde1999f204':
Security: AccountChooser shouldn't auto reveal accounts.
Adrian Roos [Fri, 10 Jul 2015 01:45:24 +0000 (01:45 +0000)]
am
83e9525c: Merge "Fix premature clearing of clearable sysui flags" into mnc-dev
* commit '
83e9525c614d4a959c5f243bcda9a75057930339':
Fix premature clearing of clearable sysui flags
Dianne Hackborn [Fri, 10 Jul 2015 01:45:17 +0000 (01:45 +0000)]
am
a681d7d9: Merge "Improve alarm manager docs." into mnc-dev
* commit '
a681d7d92b6938194d5670a11b79486365cbcd72':
Improve alarm manager docs.
John Reck [Fri, 10 Jul 2015 01:45:09 +0000 (01:45 +0000)]
am
6ed4b9df: Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev
* commit '
6ed4b9dfd6130f4517af5a99d99c5cb125600baa':
Deep-copying sucks when all you want is a borrow
John Reck [Fri, 10 Jul 2015 01:45:02 +0000 (01:45 +0000)]
am
b7ba1220: Teach ImageView to recycle internal drawables
* commit '
b7ba1220a3dc3012d2e22825eaeb0e643333f5a4':
Teach ImageView to recycle internal drawables
Svet Ganov [Fri, 10 Jul 2015 01:44:45 +0000 (01:44 +0000)]
am
171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev
* commit '
171fe6ac0aa5b0d2dd64ac1cdda25cdcb5f183f3':
Add an API for apps to query if a permisison is denied by policy.
John Reck [Fri, 10 Jul 2015 01:44:38 +0000 (01:44 +0000)]
am
4ee9b23a: Merge "Delete dead code" into mnc-dev
* commit '
4ee9b23a6f1856bfe7fa810b585b4ced02745d65':
Delete dead code
Adrian Roos [Fri, 10 Jul 2015 01:44:21 +0000 (01:44 +0000)]
am
4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev
* commit '
4d8134c1b9e11c2b3a92195fb753da7b144bad1e':
Fix black keyguard / missing status bar
Todd Kennedy [Fri, 10 Jul 2015 01:44:05 +0000 (01:44 +0000)]
am
d80cf910: Merge "Allow codepath changes for new OTA packages" into mnc-dev
* commit '
d80cf9109aa6b560e473f0197034085ed9062eaa':
Allow codepath changes for new OTA packages
Dianne Hackborn [Fri, 10 Jul 2015 01:43:39 +0000 (01:43 +0000)]
am
0e7d497c: Merge "Fix issue #
22328792: Fix scalability issues in AssistStructure" into mnc-dev
* commit '
0e7d497c10c4f5096cf4cd32a56784fd18ab0f2c':
Fix issue #
22328792: Fix scalability issues in AssistStructure
Fyodor Kupolov [Fri, 10 Jul 2015 01:43:31 +0000 (01:43 +0000)]
am
a1790304: Do not return devices when caller has no location permission
* commit '
a179030483a1f3f672be41797dc6e0f077ef4748':
Do not return devices when caller has no location permission
Christopher Tate [Fri, 10 Jul 2015 01:43:05 +0000 (01:43 +0000)]
am
adebbeba: Merge "Remote extraneous debugging log message" into mnc-dev
* commit '
adebbebaa7d516628b5946dd023ff8726e75d2b0':
Remote extraneous debugging log message
David Friedman [Fri, 10 Jul 2015 01:31:06 +0000 (01:31 +0000)]
am
a70109e4: am
019a0943: Docs: Fixes a typo.
* commit '
a70109e4cc21a58649716e8b4fcf2a7c63274f04':
Docs: Fixes a typo.
Dirk Dougherty [Fri, 10 Jul 2015 01:30:49 +0000 (01:30 +0000)]
am
8d56096b: am
f739ad7f: Fix typos in preview support.
* commit '
8d56096b59dbbcfd18ab137309fe203cca0033d8':
Fix typos in preview support.
Carlos Valdivia [Fri, 10 Jul 2015 01:25:27 +0000 (01:25 +0000)]
Merge "Security: AccountChooser shouldn't auto reveal accounts." into mnc-dev
Adrian Roos [Fri, 10 Jul 2015 01:24:47 +0000 (01:24 +0000)]
Merge "Fix premature clearing of clearable sysui flags" into mnc-dev
Dianne Hackborn [Fri, 10 Jul 2015 01:19:48 +0000 (01:19 +0000)]
Merge "Improve alarm manager docs." into mnc-dev
Carlos Valdivia [Tue, 7 Jul 2015 22:37:54 +0000 (15:37 -0700)]
Security: AccountChooser shouldn't auto reveal accounts.
Bug:
9739125
Change-Id: Ib9032271def423aaafdab2505afaf6b1d3fcad06
Dianne Hackborn [Fri, 10 Jul 2015 01:17:54 +0000 (18:17 -0700)]
Improve alarm manager docs.
Change-Id: I7547b48327a709783d908509efc7afd1a3f1a06a
John Reck [Fri, 10 Jul 2015 01:02:38 +0000 (01:02 +0000)]
Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev
Eino-Ville Talvala [Tue, 30 Jun 2015 17:34:48 +0000 (10:34 -0700)]
Camera2: Reorganize high-speed recording API slightly
- Split off distinct high speed capture session class from base capture session
- Move createHighSpeedRequestList to CameraConstrainedHighSpeedCaptureSession
Bug:
21664295
Change-Id: I67d705fdeee1eaa6e5e3e1416771d5d0df642843
John Reck [Fri, 10 Jul 2015 00:45:39 +0000 (17:45 -0700)]
Deep-copying sucks when all you want is a borrow
Bug:
22378829
std::string only knows how to move & deep-copy, and we really
don't want either here since the Paint object for certain outlives
the stack scope so use a const reference instead.
Change-Id: I1c822c6ba9647953899cfe89dcc670d7265e3973
John Reck [Fri, 10 Jul 2015 00:37:34 +0000 (17:37 -0700)]
Teach ImageView to recycle internal drawables
Bug:
22289362
It's pretty common for ImageView#setBitmap to be called
repeatedly. Avoid re-creating the BitmapDrawable in this scenario
as that has high object churn of semi-expensive objects like
Paint.
Change-Id: Ib77719cd0366d02c1a42f774850bf3b9caa9c288
Svet Ganov [Fri, 10 Jul 2015 00:32:11 +0000 (00:32 +0000)]
Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev
John Reck [Fri, 10 Jul 2015 00:30:58 +0000 (00:30 +0000)]
Merge "Delete dead code" into mnc-dev
Adrian Roos [Fri, 10 Jul 2015 00:01:19 +0000 (00:01 +0000)]
Merge "Fix black keyguard / missing status bar" into mnc-dev
Adrian Roos [Thu, 9 Jul 2015 23:22:24 +0000 (16:22 -0700)]
Fix premature clearing of clearable sysui flags
Fixes a bug where all clearable flags would be cleared even if
only a subset actually changes; new behavior is clearing only
the flags that actually got cleared.
Bug:
22331526
Change-Id: Icbb12121c977e48457692c054571521c6f6eb730
Todd Kennedy [Thu, 9 Jul 2015 23:17:38 +0000 (23:17 +0000)]
Merge "Allow codepath changes for new OTA packages" into mnc-dev
Adrian Roos [Thu, 9 Jul 2015 21:54:08 +0000 (14:54 -0700)]
Fix black keyguard / missing status bar
The status bar window was stuck in the READY_TO_SHOW state
because it was not policy visible, whereas the policy
was waiting for the window to become HAS_DRAWN.
Now BarController also updates states if the window
is READY_TO_SHOW, which in turn allows the window to
become visible and HAS_DRAWN.
Bug:
22072099
Change-Id: I1836c276723ee2205d7d5759be079f02aaa23e2e
Jeff Brown [Thu, 9 Jul 2015 23:01:33 +0000 (23:01 +0000)]
am
2a67840c: Fix a bad merge.
* commit '
2a67840c3c35a6267663e5d3ae921ee9ac614db9':
Fix a bad merge.
Dianne Hackborn [Thu, 9 Jul 2015 21:48:36 +0000 (21:48 +0000)]
Merge "Fix issue #
22328792: Fix scalability issues in AssistStructure" into mnc-dev
Fyodor Kupolov [Fri, 19 Jun 2015 22:35:11 +0000 (15:35 -0700)]
Do not return devices when caller has no location permission
During startLeScan, do not return devices if calling process has no location
permission/appop
Bug:
21852542
Change-Id: Idce8f4704558574e373e8144390f2a2fa1a7e84a
John Reck [Thu, 9 Jul 2015 21:19:01 +0000 (14:19 -0700)]
Delete dead code
Bug:
22378829
Every time setText is called a BoringLayout is created.
BoringLayout internally creates a new Paint called mWorkPaint.
However, creating a Paint turns out to be somewhat substantial
amount of work, and mWorkPaint is never actually used. Deleting
this shaves off roughly 50ms and 1,000 object creations during
a fling on a listview.
Change-Id: I5d03402b9027df6ce0f3e58160752c66c69a4d2d
Dianne Hackborn [Thu, 9 Jul 2015 00:36:37 +0000 (17:36 -0700)]
Fix issue #
22328792: Fix scalability issues in AssistStructure
We can now stream the AssistStructure across processes, avoiding
IPC size limitations for large structures. There is also a new
API that gets called on the VoiceInteractionSession if there is
a failure retrieving the assist data.
Also fix issue #
22351981: Runtime restart due to ANR in system server,
getting rid of a deadlock.
And also tweak object lifecycles to try to avoid keeping around
in an app the previous AssistStructure after we request a new one.
Change-Id: Ifb136a0d31a14e56a8db6b90768d9fc65557a17f
Christopher Tate [Thu, 9 Jul 2015 21:04:30 +0000 (21:04 +0000)]
Merge "Remote extraneous debugging log message" into mnc-dev
David Friedman [Thu, 9 Jul 2015 21:03:49 +0000 (21:03 +0000)]
am
019a0943: Docs: Fixes a typo.
* commit '
019a0943c332040bd6bde9d5afc109d1bd4c4195':
Docs: Fixes a typo.
Jeff Brown [Thu, 9 Jul 2015 20:36:26 +0000 (13:36 -0700)]
Fix a bad merge.
Change-Id: Ib722459a25c189bb800eb85d48b80bdc91a2b7db
David Friedman [Thu, 9 Jul 2015 20:33:22 +0000 (13:33 -0700)]
Docs: Fixes a typo.
Change-Id: If8dfaab493c2cff4e247e5018d764e81ad2cf46a
Dirk Dougherty [Thu, 9 Jul 2015 20:19:18 +0000 (20:19 +0000)]
am
f739ad7f: Fix typos in preview support.
* commit '
f739ad7fc33b63733d57e688f89d80b42fdc4974':
Fix typos in preview support.
Tom Hudson [Tue, 30 Jun 2015 15:26:13 +0000 (11:26 -0400)]
New setLocalMatrix() operation for HWUI
Concats any matrix passed through from DisplayListCanvas with the
initialTransform of the containing RenderNode.
BUG:
22189925
Change-Id: I5ea54a6e2a29520c79a8860bde7682694e8595d2
Jeff Brown [Thu, 9 Jul 2015 20:10:26 +0000 (20:10 +0000)]
am
c1aebfa0: Merge "Clean up USB Manager and fix ADB." into mnc-dev
* commit '
c1aebfa02c393471fb344c3a94ee2ae62bb78f93':
Clean up USB Manager and fix ADB.
Raph Levien [Thu, 9 Jul 2015 20:10:18 +0000 (20:10 +0000)]
am
968f9fdf: Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev
* commit '
968f9fdf8b2042b4d7b408f4b2a9db5008eaca6e':
Slightly more precise RTL check in BoringLayout.isBoring()
Dirk Dougherty [Thu, 9 Jul 2015 20:05:04 +0000 (13:05 -0700)]
Fix typos in preview support.
Change-Id: I1d1daca4dbc0c9ca9c38bc5a73773a5822520b06
Jeff Brown [Thu, 9 Jul 2015 20:03:26 +0000 (20:03 +0000)]
Merge "Clean up USB Manager and fix ADB." into mnc-dev
Raph Levien [Thu, 9 Jul 2015 19:56:18 +0000 (19:56 +0000)]
Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev
Jeff Brown [Wed, 1 Jul 2015 00:57:12 +0000 (17:57 -0700)]
Clean up USB Manager and fix ADB.
Moved functions which parse the USB functions list into one common
place on UsbManager.
Deleted the no longer supported USB_FUNCTION_MASS_STORAGE.
Ensured that the UserManager.DISALLOW_USB_FILE_TRANSFER rule is
consistently applied during user switch and when changing the
current USB functions and make sure it only affects MTP and PTP.
Collapsed the boot completed and user switched receivers to
ensure consistent ordering of side-effects.
Validate the list of functions passed to setCurrentFunction() so
that the separation of concerns is clearer. It was somewhat
ambiguous as to whether functions such as ADB could / should be
enabled through that interface. Improved the docs for clarity.
Fixed a bunch of broken stuff related to the USB config
persistent property (list of default functions) that could cause
ADB and other functions to not work at all. Added new failsafes
to ensure that we reliably get back into a happy state.
Bug:
22206076
Change-Id: I02915ddfce7193a8f67a14f0d76bab22fc575dfa
Raph Levien [Thu, 9 Jul 2015 19:36:31 +0000 (12:36 -0700)]
Slightly more precise RTL check in BoringLayout.isBoring()
This patch refines the crude check for potential RTL characters, based
on ranges containing RTL scripts and format characters that affect
bidi. This will make it much less likely that a StaticLayout will be
chosen instead of a BoringLayout.
Bug:
22328919
Change-Id: I9a0ed9b3f3373069052de21c836b3372f175430f
Christopher Tate [Thu, 9 Jul 2015 19:42:50 +0000 (12:42 -0700)]
Remote extraneous debugging log message
Bug
22069429
Change-Id: I4e3803aff58449b2544d9d7cca27d8d2115ccdd6
Jorim Jaggi [Thu, 9 Jul 2015 19:32:50 +0000 (19:32 +0000)]
am
3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
* commit '
3cc5c24b83edaab66c97b161e25ff0bd93b3e1b4':
Fix assist for hardware long-press
Jorim Jaggi [Thu, 9 Jul 2015 19:19:04 +0000 (19:19 +0000)]
Merge "Fix assist for hardware long-press" into mnc-dev
Julia Reynolds [Thu, 9 Jul 2015 19:09:01 +0000 (19:09 +0000)]
am
279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev
* commit '
279678e1ffc72090a56a1ccd7f782d3c7c0b228f':
Show a default icon for permissions that lack a group.
Jason Monk [Thu, 9 Jul 2015 19:08:52 +0000 (19:08 +0000)]
am
58599104: Merge "Remove data icon for WFC" into mnc-dev
* commit '
5859910463df29324df868f30e0ff66440cf161f':
Remove data icon for WFC
Jason Monk [Thu, 9 Jul 2015 19:08:44 +0000 (19:08 +0000)]
am
8969817a: Merge "Fix roaming icon when not default signal" into mnc-dev
* commit '
8969817a83e2ed5f28f67bd5f7f4de14a5455139':
Fix roaming icon when not default signal
Julia Reynolds [Thu, 9 Jul 2015 18:58:12 +0000 (18:58 +0000)]
Merge "Show a default icon for permissions that lack a group." into mnc-dev
Julia Reynolds [Wed, 8 Jul 2015 15:12:28 +0000 (11:12 -0400)]
Show a default icon for permissions that lack a group.
Bug:
22229417
Change-Id: I82e12504adcca5d3fb6902109a3d7075a4739843
Jason Monk [Thu, 9 Jul 2015 18:55:00 +0000 (18:55 +0000)]
Merge "Remove data icon for WFC" into mnc-dev
Jason Monk [Thu, 9 Jul 2015 18:54:58 +0000 (18:54 +0000)]
Merge "Fix roaming icon when not default signal" into mnc-dev
Amith Yamasani [Thu, 9 Jul 2015 18:10:10 +0000 (18:10 +0000)]
am
5d21f416: Merge "Dispatch onUserSwitched callbacks on handler thread" into mnc-dev
* commit '
5d21f4168e7e8625427eb2210e59b30bff5b3b85':
Dispatch onUserSwitched callbacks on handler thread
Amith Yamasani [Thu, 9 Jul 2015 17:56:48 +0000 (17:56 +0000)]
Merge "Dispatch onUserSwitched callbacks on handler thread" into mnc-dev
Narayan Kamath [Thu, 9 Jul 2015 17:51:05 +0000 (17:51 +0000)]
am
f17d77cd: am
43a2aca4: Merge "Remove @ToBeFixed from knowntags."
* commit '
f17d77cd9d4cc4ce5086ad45cfcc822d46951b99':
Remove @ToBeFixed from knowntags.
Amith Yamasani [Wed, 8 Jul 2015 22:50:13 +0000 (15:50 -0700)]
Dispatch onUserSwitched callbacks on handler thread
This avoids multiple threads calling beginBroadcast on the observers
list.
Bug:
22339693
Change-Id: I78a154415ccd17c9460b25589d46dadcdb850941
Narayan Kamath [Thu, 9 Jul 2015 17:38:46 +0000 (17:38 +0000)]
am
43a2aca4: Merge "Remove @ToBeFixed from knowntags."
* commit '
43a2aca4c279d3db8abdf4692249134fdd69bd96':
Remove @ToBeFixed from knowntags.
Todd Kennedy [Thu, 9 Jul 2015 17:06:35 +0000 (10:06 -0700)]
Allow codepath changes for new OTA packages
When an OTA contains a new package, the system performs some gymnastics
to ensure that we use the most up-to-date version of the package in
either the system image or user directory. But, during boot, we enforce
a package's codepath will never change. This prevents a user-installed
package from ever overriding the system provide package [regardless of
version]. In this one, specific instance, we allow a package's codepath
to change.
Bug:
22179337
Change-Id: I2c29a87801fb5960ffbd2268231446895ad1868f
Christopher Tate [Thu, 9 Jul 2015 17:25:52 +0000 (17:25 +0000)]
am
607a040d: Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev
* commit '
607a040dae1b8fde0f9ea9f1723e0721f891f3dd':
Add a mechanism for products to specify default active app linkages
Alan Viverette [Thu, 9 Jul 2015 17:25:43 +0000 (17:25 +0000)]
am
322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev
* commit '
322fd93f888a0b42ee860398debe04b84b8b223f':
Add missing break in AccessibilityEvent.eventTypeToString()
Fyodor Kupolov [Thu, 9 Jul 2015 17:25:34 +0000 (17:25 +0000)]
am
3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev
* commit '
3f51188294a910c8985c778c7d86a909e6cbee25':
Check location permission/appop in getScanResults
Robert Greenwalt [Thu, 9 Jul 2015 17:25:27 +0000 (17:25 +0000)]
am
b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev
* commit '
b091695bd9b9a87fc637751cfa2b52c8b72ce487':
Revive NetworkInfo's SUSPENDED state.
Narayan Kamath [Thu, 9 Jul 2015 17:22:13 +0000 (17:22 +0000)]
Merge "Remove @ToBeFixed from knowntags."
Christopher Tate [Thu, 9 Jul 2015 17:17:58 +0000 (17:17 +0000)]
Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev
Alan Viverette [Thu, 9 Jul 2015 17:17:35 +0000 (17:17 +0000)]
Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev
Fyodor Kupolov [Thu, 9 Jul 2015 17:14:14 +0000 (17:14 +0000)]
Merge "Check location permission/appop in getScanResults" into mnc-dev
Robert Greenwalt [Thu, 9 Jul 2015 17:09:15 +0000 (17:09 +0000)]
Merge "Revive NetworkInfo's SUSPENDED state." into mnc-dev
Jeff Sharkey [Thu, 9 Jul 2015 17:07:40 +0000 (17:07 +0000)]
am
ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev
* commit '
ee4a534b7bbe95fa913473e3288787fcd1050c49':
Timeout when partitioning takes too long.
Jeff Sharkey [Thu, 9 Jul 2015 17:07:31 +0000 (17:07 +0000)]
am
a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev
* commit '
a419076eab4ebf54186c5801216f611e080edf5f':
Add grant flag support to "install-create" verb.
Mikhail Naganov [Thu, 9 Jul 2015 17:07:24 +0000 (17:07 +0000)]
am
abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev
* commit '
abb8dc97586cc15fa16bab7dd80ffe02a379550f':
Enhance documentation of WebSettings.WebSettings method
Jeff Sharkey [Thu, 9 Jul 2015 16:59:14 +0000 (16:59 +0000)]
Merge "Timeout when partitioning takes too long." into mnc-dev
Jeff Sharkey [Thu, 9 Jul 2015 16:58:45 +0000 (16:58 +0000)]
Merge "Add grant flag support to "install-create" verb." into mnc-dev
Narayan Kamath [Thu, 9 Jul 2015 16:54:45 +0000 (17:54 +0100)]
Remove @ToBeFixed from knowntags.
It's used nowhere and will be deleted shortly.
Change-Id: Ie87f16cd060445c0e0ccac4e9a192ca266c92851