OSDN Git Service
Narayan Kamath [Mon, 6 Jun 2016 16:17:42 +0000 (16:17 +0000)]
PackageManager: Rename foreign use markers on app installation. am:
110a12dff1
am:
23dca60005
* commit '
23dca600054c7141560c373046fbe6f4eed88254':
PackageManager: Rename foreign use markers on app installation.
Change-Id: I1549786a09fe11a7097b920391bd0cfd6ed68ad5
Narayan Kamath [Mon, 6 Jun 2016 16:11:51 +0000 (16:11 +0000)]
PackageManager: Rename foreign use markers on app installation.
am:
110a12dff1
* commit '
110a12dff13276baa12e8587449a1a7f3a318451':
PackageManager: Rename foreign use markers on app installation.
Change-Id: I9b3450fe63781dff6c7b36053019a98e135ca71d
Narayan Kamath [Mon, 6 Jun 2016 15:47:37 +0000 (15:47 +0000)]
PackageManager: Dexopt core-apps during service bringup. am:
258aa3e56b
am:
78f8b9b111
* commit '
78f8b9b111ad8de5fefeb11e8db29d25bfdad83b':
Change-Id: I017696c403f28691f83b279da9597a237b45a59b
Narayan Kamath [Mon, 6 Jun 2016 15:24:03 +0000 (15:24 +0000)]
PackageManager: Dexopt core-apps during service bringup. am:
258aa3e56b
am:
43899a2f9d
* commit '
43899a2f9d1f70407620b008186dc65894ae78ea':
PackageManager: Dexopt core-apps during service bringup.
Change-Id: I66d55754781e56ed35d47dfe51768f782eee9a55
Narayan Kamath [Mon, 6 Jun 2016 15:24:01 +0000 (15:24 +0000)]
PackageManager: Dexopt core-apps during service bringup.
am:
258aa3e56b
* commit '
258aa3e56b02b95e8e855ef949a29babe178b4a5':
PackageManager: Dexopt core-apps during service bringup.
Change-Id: I2fe2508835b564f8d69a5aa743c6f9ea9f1575cc
Narayan Kamath [Mon, 6 Jun 2016 15:14:46 +0000 (15:14 +0000)]
PackageManager: Dexopt core-apps during service bringup.
am:
258aa3e56b
* commit '
258aa3e56b02b95e8e855ef949a29babe178b4a5':
PackageManager: Dexopt core-apps during service bringup.
Change-Id: I15f177dc4fb5c5f6374982cd42eb606650818e81
Narayan Kamath [Thu, 2 Jun 2016 13:01:16 +0000 (14:01 +0100)]
PackageManager: Rename foreign use markers on app installation.
The foreign use markers contain the codePath for a given executable
dex file, so we'll need to rename them when the codePath changes
during an application update. If we don't do this, we might compile
that are used widely across processes (such as GMS core) with
suboptimal filters.
This seems like a messy and brittle design in general, and will be
rewritten post N so that we don't rely on file system topology.
bug:
28998083
Change-Id: Ie4f3995ba52f098edb911b5a388c63696bbd77ac
Narayan Kamath [Wed, 1 Jun 2016 12:56:18 +0000 (13:56 +0100)]
PackageManager: Dexopt core-apps during service bringup.
Code from these apps can be loaded by the system_server and so
we need to make sure they're compiled before their package contexts
are requested. Leaving them interpreted will cause performance issues.
On a Nexus 6P with WITH_DEXPREOPT=false, this adds an additional
26 seconds to every upgrade / first-boot and ends up optimizing a total
of 20 apps.
bug:
28639246
Change-Id: Ief3c0048fda4f1b1742fbf3e2476e65fa607a18a
Android Build Merger (Role) [Mon, 6 Jun 2016 11:34:39 +0000 (11:34 +0000)]
Merge "Merge "Include network name in validation logs for dumpsys" into nyc-dev am:
916f79882d am:
0c67999abd" into nyc-mr1-dev-plus-aosp
Paul Jensen [Mon, 6 Jun 2016 11:34:10 +0000 (11:34 +0000)]
Merge "Include network name in validation logs for dumpsys" into nyc-dev am:
916f79882d
am:
0c67999abd
* commit '
0c67999abd2ed2a3ff3c78a74f0c65688505df1e':
Include network name in validation logs for dumpsys
Change-Id: Ie6778a47bab7e52795684d46672e42630c192d64
Paul Jensen [Mon, 6 Jun 2016 11:34:06 +0000 (11:34 +0000)]
Merge "Include network name in validation logs for dumpsys" into nyc-dev am:
916f79882d
am:
9a33e1c81e
* commit '
9a33e1c81e2b133d28fd57e013a2858818789541':
Include network name in validation logs for dumpsys
Change-Id: I448ed66de8de6444f4506892fd3e8043f203cc11
Paul Jensen [Mon, 6 Jun 2016 11:23:57 +0000 (11:23 +0000)]
Merge "Include network name in validation logs for dumpsys" into nyc-dev
am:
916f79882d
* commit '
916f79882d7867d27fbd7abb32ec53028d9d3951':
Include network name in validation logs for dumpsys
Change-Id: I157481d338e65d7e89e4f97382f84ab2a3110e20
Paul Jensen [Mon, 6 Jun 2016 11:23:51 +0000 (11:23 +0000)]
Merge "Include network name in validation logs for dumpsys" into nyc-dev
am:
916f79882d
* commit '
916f79882d7867d27fbd7abb32ec53028d9d3951':
Include network name in validation logs for dumpsys
Change-Id: Ic5345cb7f309e509c7b9d7cb7b7ec4b95b8f1102
Paul Jensen [Mon, 6 Jun 2016 11:08:44 +0000 (11:08 +0000)]
Merge "Include network name in validation logs for dumpsys" into nyc-dev
Android Build Merger (Role) [Mon, 6 Jun 2016 10:44:20 +0000 (10:44 +0000)]
Merge "Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am:
265f4113ee am:
d2cf835880" into nyc-mr1-dev-plus-aosp
Robin Lee [Mon, 6 Jun 2016 10:43:54 +0000 (10:43 +0000)]
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am:
265f4113ee
am:
d2cf835880
* commit '
d2cf835880f2207e2df090599130f32ccb73f23d':
Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Change-Id: I676da29aa5322563b20a95afd504e3b4d68fd2a0
Robin Lee [Mon, 6 Jun 2016 10:43:51 +0000 (10:43 +0000)]
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am:
265f4113ee
am:
6cbf4e5119
* commit '
6cbf4e51199e12d1d935415f6fa38031cb53ac4d':
Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Change-Id: I931c5d99282a6350e15aefbf400c90935237e679
Victor Chang [Mon, 6 Jun 2016 10:33:00 +0000 (10:33 +0000)]
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev
am:
265f4113ee
* commit '
265f4113ee42e89f324b087a81044a9f1dab457e':
Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Change-Id: Iba3df72496f067c5e0291449be3bfbd9ce2031ff
Victor Chang [Mon, 6 Jun 2016 10:30:42 +0000 (10:30 +0000)]
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev
am:
265f4113ee
* commit '
265f4113ee42e89f324b087a81044a9f1dab457e':
Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Change-Id: I86a8f5c9b2dbd8ea71bdc8fb6268f3d9dc7e329d
Robin Lee [Mon, 6 Jun 2016 10:10:54 +0000 (10:10 +0000)]
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev
Android Build Merger (Role) [Sun, 5 Jun 2016 18:23:54 +0000 (18:23 +0000)]
Merge "Fix issue #
29006049: Add logging for implicit broadcasts am:
bc02a3901d am:
13c2764cef" into nyc-mr1-dev-plus-aosp
Dianne Hackborn [Sun, 5 Jun 2016 18:23:24 +0000 (18:23 +0000)]
Fix issue #
29006049: Add logging for implicit broadcasts am:
bc02a3901d
am:
13c2764cef
* commit '
13c2764cef15b9fe4b67f98be458f3108a9137f3':
Fix issue #
29006049: Add logging for implicit broadcasts
Change-Id: Ifc45426f34e0aad7c6f29a06a99ade35fd5528e9
Dianne Hackborn [Sun, 5 Jun 2016 18:23:21 +0000 (18:23 +0000)]
Fix issue #
29006049: Add logging for implicit broadcasts am:
bc02a3901d
am:
ced0e2960d
* commit '
ced0e2960d1608df92d7de28fffc6c51001843d2':
Fix issue #
29006049: Add logging for implicit broadcasts
Change-Id: I17bcafe217d4f138410c18a6f3f52bc4fb2d2c29
Dianne Hackborn [Sun, 5 Jun 2016 18:17:01 +0000 (18:17 +0000)]
Fix issue #
29006049: Add logging for implicit broadcasts
am:
bc02a3901d
* commit '
bc02a3901dea52d236dd855722191155156cb856':
Fix issue #
29006049: Add logging for implicit broadcasts
Change-Id: I291b4639b55b690ff6e817f87aee5d69986fbe3b
Dianne Hackborn [Sun, 5 Jun 2016 18:17:01 +0000 (18:17 +0000)]
Fix issue #
29006049: Add logging for implicit broadcasts
am:
bc02a3901d
* commit '
bc02a3901dea52d236dd855722191155156cb856':
Fix issue #
29006049: Add logging for implicit broadcasts
Change-Id: Ifd88a4ce68bd9c2853d085bb10f74df682ae8ee6
Dianne Hackborn [Fri, 3 Jun 2016 00:15:08 +0000 (17:15 -0700)]
Fix issue #
29006049: Add logging for implicit broadcasts
We now have stats on broadcasts. We collect them over a day and
then reset, retaining the last days stats. When a checkin happens,
we return either the last day or the current stats and then clear
them. Not bothing to persist anything to storage, this data is
not that critical.
Change-Id: I1c3b331bcd03f79fa5e10575d9bc2ad7d9104f6f
fionaxu [Sat, 4 Jun 2016 05:53:44 +0000 (05:53 +0000)]
Merge "cold sim clean up" into nyc-mr1-dev
am:
ba3428f01b
* commit '
ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6':
cold sim clean up
Change-Id: I5a2e24d997408badd6db7576b2fa206eb9e5c4ca
Chen Xu [Sat, 4 Jun 2016 05:48:46 +0000 (05:48 +0000)]
Merge "cold sim clean up" into nyc-mr1-dev
Jorim Jaggi [Sat, 4 Jun 2016 01:44:23 +0000 (01:44 +0000)]
Fix delayed light status bar animation
am:
72a6f058cf
* commit '
72a6f058cfcb72cad4da5ec8c84bc0a2b0d533a0':
Fix delayed light status bar animation
Change-Id: I438a2c78f34676bd1040f3212af55e0141d48c9c
Jorim Jaggi [Thu, 5 May 2016 23:25:43 +0000 (16:25 -0700)]
Fix delayed light status bar animation
Make sure to do another layout when we show the dim layer so PWM
can pick up the change and send it to SysUI.
Bug:
28434629
Change-Id: I877669ede8534601933043f60c8cef8502918c7b
Jorim Jaggi [Sat, 4 Jun 2016 00:27:04 +0000 (00:27 +0000)]
Merge "Add new attributes for wallpaper info" into nyc-mr1-dev
am:
c27660d45a
* commit '
c27660d45a920af49c9e53b1cabaa32fd4b3046c':
Add new attributes for wallpaper info
Change-Id: I3dc04d70f50809ff20ec0fb23e0c3265450ff621
TreeHugger Robot [Sat, 4 Jun 2016 00:22:05 +0000 (00:22 +0000)]
Merge "Add new attributes for wallpaper info" into nyc-mr1-dev
Selim Cinek [Fri, 3 Jun 2016 23:31:16 +0000 (23:31 +0000)]
Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am:
6c94972622
am:
45735b4c53
* commit '
45735b4c534f0423b02ac6401e3f3ac903e746fb':
Change-Id: I9b10857fd6021beff577b58568a207fbb2b8617e
Android Build Merger (Role) [Fri, 3 Jun 2016 23:28:12 +0000 (23:28 +0000)]
Merge "Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am:
6c94972622 am:
f7b21e1db0" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 3 Jun 2016 23:28:06 +0000 (23:28 +0000)]
Merge "Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev am:
3af59ef42c" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 3 Jun 2016 23:27:57 +0000 (23:27 +0000)]
Merge "Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev am:
eb47d6205f am:
440e3c7dfe" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 3 Jun 2016 23:27:52 +0000 (23:27 +0000)]
Merge "Merge "Delete account from DE and CE databases" into nyc-dev am:
a087d7f4fa am:
93f4735f2f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 3 Jun 2016 23:27:39 +0000 (23:27 +0000)]
Merge "Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am:
f4973c28a5 am:
90ee70e519" into nyc-dev am:
c0b602c441 am:
422679c891" into nyc-mr1-dev-plus-aosp
George Mount [Fri, 3 Jun 2016 23:27:31 +0000 (23:27 +0000)]
Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev
am:
3af59ef42c
* commit '
3af59ef42c83fbe4bf9e54f807597bddc6aa7ecd':
Internal API for cross-task Activity used by assistant.
Change-Id: Idb8c49437ff7d151e186edd2112e4def8d7a7e15
Android Build Merger (Role) [Fri, 3 Jun 2016 23:27:29 +0000 (23:27 +0000)]
Merge "Merge "docs: Update N release notes for DP4" into nyc-dev am:
e20c1e96fc am:
16918804a2" into nyc-mr1-dev-plus-aosp
James Hawkins [Fri, 3 Jun 2016 23:27:28 +0000 (23:27 +0000)]
Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev am:
eb47d6205f
am:
440e3c7dfe
* commit '
440e3c7dfed674bd56f1693e7c7a67e21cf707bb':
am/UserController: Log system uptime at two 'boot complete' markers.
Change-Id: Idf1bc4cd1c317e230413eb48785ae78579460cb3
Android Build Merger (Role) [Fri, 3 Jun 2016 23:27:14 +0000 (23:27 +0000)]
Merge "Merge "New prebuilt" into nyc-dev am:
93b34141b1 am:
d2568ccdcc" into nyc-mr1-dev-plus-aosp
Selim Cinek [Fri, 3 Jun 2016 23:26:33 +0000 (23:26 +0000)]
Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am:
6c94972622
am:
f7b21e1db0
* commit '
f7b21e1db040b211356e639b5324a4826871de69':
Fixed a bug where talkback couldn't scroll through notifications
Change-Id: Ie1dc2e51af0acfddfcb4538dcd90e7558379524e
Fyodor Kupolov [Fri, 3 Jun 2016 23:26:31 +0000 (23:26 +0000)]
Merge "Delete account from DE and CE databases" into nyc-dev am:
a087d7f4fa
am:
93f4735f2f
* commit '
93f4735f2ffd4dfc8ea29c98cc6d9079a309f883':
Delete account from DE and CE databases
Change-Id: I9e647dcb5fa4b1acc19a61a509f73234877c75f7
Billy Lamberta [Fri, 3 Jun 2016 23:26:28 +0000 (23:26 +0000)]
Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am:
f4973c28a5 am:
90ee70e519" into nyc-dev am:
c0b602c441
am:
422679c891
* commit '
422679c8919db6b48b54d8c4745251591b0c3c50':
docs: Fix code sample in /work: Set up Single-Purpose Devices
Change-Id: I01977b5e0c27390f84845b3bcd5011314565a20d
Andrew Solovay [Fri, 3 Jun 2016 23:26:25 +0000 (23:26 +0000)]
Merge "docs: Update N release notes for DP4" into nyc-dev am:
e20c1e96fc
am:
16918804a2
* commit '
16918804a2b57f780932723c2f2eb7c59f095d23':
docs: Update N release notes for DP4
Change-Id: I5a7873ac81c988395b4ab142f9d8aec0aba8324f
Wang Xiaolei [Fri, 3 Jun 2016 23:24:11 +0000 (23:24 +0000)]
Merge "New prebuilt" into nyc-dev am:
93b34141b1
am:
d2568ccdcc
* commit '
d2568ccdcca2f974ed93c95de140f3c249888fe0':
New prebuilt
Change-Id: I75f949e7925e2be08fd4ae57b3477974a38a7b42
Selim Cinek [Fri, 3 Jun 2016 23:22:01 +0000 (23:22 +0000)]
Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am:
6c94972622
am:
6efad815c2
* commit '
6efad815c2fc81416d17521a547407dec0528a58':
Fixed a bug where talkback couldn't scroll through notifications
Change-Id: I4cbe2a13cd2a05dd9c550a0499e72ef5035b92c1
Fyodor Kupolov [Fri, 3 Jun 2016 23:21:59 +0000 (23:21 +0000)]
Merge "Delete account from DE and CE databases" into nyc-dev am:
a087d7f4fa
am:
de5521d049
* commit '
de5521d049356b13301b7f6d27879af42224a563':
Delete account from DE and CE databases
Change-Id: I1286a795b0f472732426690b32fe69a161552306
Billy Lamberta [Fri, 3 Jun 2016 23:21:56 +0000 (23:21 +0000)]
Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am:
f4973c28a5 am:
90ee70e519" into nyc-dev am:
c0b602c441
am:
ce13039f1d
* commit '
ce13039f1d4336d713700455ad0af388cc896d0a':
docs: Fix code sample in /work: Set up Single-Purpose Devices
Change-Id: Ic8bd13319057fe94d98aa2c3a9a64e46728c2345
Andrew Solovay [Fri, 3 Jun 2016 23:21:54 +0000 (23:21 +0000)]
Merge "docs: Update N release notes for DP4" into nyc-dev am:
e20c1e96fc
am:
37286f7092
* commit '
37286f7092e14184abf9f3435771d72ca1004f25':
docs: Update N release notes for DP4
Change-Id: I41f94bc08cc6da0f8a6405c45577c519d473280d
Wang Xiaolei [Fri, 3 Jun 2016 23:21:50 +0000 (23:21 +0000)]
Merge "New prebuilt" into nyc-dev am:
93b34141b1
am:
b724b68812
* commit '
b724b68812d5ea90d2d149b2abf7af4f91816bca':
New prebuilt
Change-Id: I6a2bf01417ada0fee5f6cc4e39bc224bf7731554
Wang Xiaolei [Fri, 3 Jun 2016 23:00:34 +0000 (23:00 +0000)]
Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev am:
44b24c9b38
am:
36481749e6
* commit '
36481749e61cf6286630a86699c16c595a13450d':
Change-Id: I058ff76e2c092fc38097c65860b33c4db35cca4c
Jorim Jaggi [Tue, 24 May 2016 07:29:19 +0000 (00:29 -0700)]
Add new attributes for wallpaper info
Adjust test wallpaper to use these attributes.
Also fix some issues where wallpaper got laid out differently in the preview
mode.
Bug:
28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
George Mount [Fri, 3 Jun 2016 22:22:52 +0000 (22:22 +0000)]
Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev
James Hawkins [Fri, 3 Jun 2016 22:20:14 +0000 (22:20 +0000)]
Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev
am:
eb47d6205f
* commit '
eb47d6205f28d89d8bb1a3e127659dc24727fa7e':
am/UserController: Log system uptime at two 'boot complete' markers.
Change-Id: I487eaa279cc0054675c722d1c91b82598b4dd45d
Selim Cinek [Fri, 3 Jun 2016 22:18:16 +0000 (22:18 +0000)]
Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev
am:
6c94972622
* commit '
6c94972622a5fa6c2f0beb16f190015e81584013':
Fixed a bug where talkback couldn't scroll through notifications
Change-Id: I41bf71eabe7ab90cd93df33c28ac07ad5abd8354
Fyodor Kupolov [Fri, 3 Jun 2016 22:18:15 +0000 (22:18 +0000)]
Merge "Delete account from DE and CE databases" into nyc-dev
am:
a087d7f4fa
* commit '
a087d7f4fa6de262aef346acb336fcb826d05d23':
Delete account from DE and CE databases
Change-Id: Id21fda0bca3c257f5ba8e68fb09a6de47f8f3374
Billy Lamberta [Fri, 3 Jun 2016 22:18:13 +0000 (22:18 +0000)]
Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am:
f4973c28a5 am:
90ee70e519" into nyc-dev
am:
c0b602c441
* commit '
c0b602c441337f9597959a02262de525b1793a94':
docs: Fix code sample in /work: Set up Single-Purpose Devices
Change-Id: I18a126393bb04d0325946a980f247edd2f3788ad
Andrew Solovay [Fri, 3 Jun 2016 22:18:11 +0000 (22:18 +0000)]
Merge "docs: Update N release notes for DP4" into nyc-dev
am:
e20c1e96fc
* commit '
e20c1e96fc0bb85ad5fe52ec1734c2563886dab0':
docs: Update N release notes for DP4
Change-Id: Iee292ba0b9f1f1eae2dcaadf58a06b75e4d5c8f3
Todd Kennedy [Fri, 3 Jun 2016 22:17:58 +0000 (22:17 +0000)]
Merge "New prebuilt" into nyc-dev
am:
93b34141b1
* commit '
93b34141b1de89a8f176884c3ceb7bc968b252d0':
New prebuilt
Change-Id: I4a9041473718ae00499dcccb2ccf98204ccfb80a
James Hawkins [Fri, 3 Jun 2016 22:06:41 +0000 (22:06 +0000)]
Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev
am:
eb47d6205f
* commit '
eb47d6205f28d89d8bb1a3e127659dc24727fa7e':
am/UserController: Log system uptime at two 'boot complete' markers.
Change-Id: I4846c21cb7623c5528ebd51f8bc95d55b40d8536
TreeHugger Robot [Fri, 3 Jun 2016 22:01:02 +0000 (22:01 +0000)]
Merge "am/UserController: Log system uptime at two 'boot complete' markers." into nyc-dev
George Mount [Fri, 27 May 2016 18:02:13 +0000 (11:02 -0700)]
Internal API for cross-task Activity used by assistant.
29091742
A new internal API has been created for use by assistant
to launch an Activity Transition from a non-Activity.
The ActivityOptions are also passed along when using
a spring board Activity so that the shared elements
can be properly synchronized.
This also fixes TransitionManager.endTransition so
that it forces Transitions to end the animations.
Change-Id: Id18d9765bfc0c7b438e17966455aa66d3fa3aeda
Selim Cinek [Fri, 3 Jun 2016 20:51:49 +0000 (20:51 +0000)]
Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev
am:
6c94972622
* commit '
6c94972622a5fa6c2f0beb16f190015e81584013':
Fixed a bug where talkback couldn't scroll through notifications
Change-Id: I66de0c19d02ef87cdb183c1d3f55ca7f6451cab8
Jeff Sharkey [Fri, 3 Jun 2016 20:40:32 +0000 (20:40 +0000)]
Fix build after merge.
am:
9351225839
* commit '
935122583967643979f103030b95afd59e57ff59':
Fix build after merge.
Change-Id: I7c92c65266e623f8b245b4dcbbd6aef85eaef74b
Fyodor Kupolov [Fri, 3 Jun 2016 20:40:21 +0000 (20:40 +0000)]
Merge "Delete account from DE and CE databases" into nyc-dev
am:
a087d7f4fa
* commit '
a087d7f4fa6de262aef346acb336fcb826d05d23':
Delete account from DE and CE databases
Change-Id: Ied3a5d614b814be094df50317db494f60b5a4727
Selim Cinek [Fri, 3 Jun 2016 20:39:23 +0000 (20:39 +0000)]
Merge "Fixed a bug where talkback couldn't scroll through notifications" into nyc-dev
Billy Lamberta [Fri, 3 Jun 2016 20:36:26 +0000 (20:36 +0000)]
Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am:
f4973c28a5 am:
90ee70e519" into nyc-dev
am:
c0b602c441
* commit '
c0b602c441337f9597959a02262de525b1793a94':
docs: Fix code sample in /work: Set up Single-Purpose Devices
Change-Id: I530258e6dca8b185f844c626fa7bf1e7f6fbd42d
Jeff Sharkey [Fri, 3 Jun 2016 20:34:16 +0000 (14:34 -0600)]
Fix build after merge.
Change-Id: Iccb1c5a12d453d70eea7e1e3d64d97bc75987bef
Andrew Solovay [Fri, 3 Jun 2016 20:30:30 +0000 (20:30 +0000)]
Merge "docs: Update N release notes for DP4" into nyc-dev
am:
e20c1e96fc
* commit '
e20c1e96fc0bb85ad5fe52ec1734c2563886dab0':
docs: Update N release notes for DP4
Change-Id: I98913abb1a13fb9fa1f1b2139fd9fa43e4add25c
Todd Kennedy [Fri, 3 Jun 2016 20:06:47 +0000 (20:06 +0000)]
Merge "New prebuilt" into nyc-dev
am:
93b34141b1
* commit '
93b34141b1de89a8f176884c3ceb7bc968b252d0':
New prebuilt
Change-Id: I677b6b38ff15f6c2e012c9c17780d2a060c3d86e
Wang Xiaolei [Fri, 3 Jun 2016 20:01:37 +0000 (20:01 +0000)]
Merge commit \'
44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9
am:
f5b0bf3563
* commit '
f5b0bf356350b53d02d6dfea96defd087f8c2f2a':
Revert "Revert "Finalize resource IDs for N.""
Change-Id: I7b86da45e999d538641dcc4221c25eb148adf495
TreeHugger Robot [Fri, 3 Jun 2016 20:00:26 +0000 (20:00 +0000)]
Merge "Delete account from DE and CE databases" into nyc-dev
Jeff Sharkey [Fri, 3 Jun 2016 19:53:48 +0000 (13:53 -0600)]
Merge commit '
44b24c9b38d87dfd8bee2aca381f18a9106313dc' into manual_merge_44b24c9
Change-Id: Ie4e0b91f5479f43864b86ff013ff8eb7bed6cd86
Bill Yi [Fri, 3 Jun 2016 19:31:16 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
8ad820ef54 -s ours
* commit '
8ad820ef5499c42fc47d5b5d60928ba90362f824':
Import translations. DO NOT MERGE
Change-Id: If55e4d7f6ffde77bdce671f8c771f2fe2fe0d4b7
Michael Wright [Fri, 3 Jun 2016 19:27:36 +0000 (19:27 +0000)]
Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev
am:
44b24c9b38
* commit '
44b24c9b38d87dfd8bee2aca381f18a9106313dc':
Revert "Revert "Finalize resource IDs for N.""
Change-Id: Ie8327dac7fbecebe98ce9f7cc9c3d29d818b23f6
TreeHugger Robot [Fri, 3 Jun 2016 19:25:16 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 3 Jun 2016 18:57:23 +0000 (18:57 +0000)]
Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am:
f4973c28a5 am:
90ee70e519" into nyc-dev
Billy Lamberta [Fri, 3 Jun 2016 18:56:53 +0000 (18:56 +0000)]
docs: Fix code sample in /work: Set up Single-Purpose Devices am:
f4973c28a5
am:
90ee70e519
* commit '
90ee70e51927a1cd764bb523f419252547739803':
docs: Fix code sample in /work: Set up Single-Purpose Devices
Change-Id: I19728a3809efb6c3341fa75678625ad0d617d4d5
Sanket Agarwal [Fri, 3 Jun 2016 18:49:24 +0000 (18:49 +0000)]
resolve merge conflicts of
9eb77405 to nyc-dev-plus-aosp
am:
950abbd075
* commit '
950abbd0751e863364a1ad976713a959bcb2dc8c':
While turning OFF do not honor ON requests.
Change-Id: I5bbda2536bd0f33dad2d2b07b24acfb91f27a1ce
TreeHugger Robot [Fri, 3 Jun 2016 18:48:56 +0000 (18:48 +0000)]
Merge "docs: Update N release notes for DP4" into nyc-dev
fionaxu [Mon, 23 May 2016 23:33:16 +0000 (16:33 -0700)]
cold sim clean up
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
to false if we want to hide "sign in" notification and placed
carrier-specific notification instead. it is set on connect, once set,
it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support
Bug:
28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
Android Build Merger (Role) [Fri, 3 Jun 2016 18:33:16 +0000 (18:33 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
2e032b7463 -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Fri, 3 Jun 2016 18:32:44 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
2e032b7463 -s ours
* commit '
2e032b7463bef48b88cd18f2c5b8501a0d80b9ce':
Import translations. DO NOT MERGE
Change-Id: Ia90dbc3d86b317621b525665a9817cd41b8d497f
Billy Lamberta [Fri, 3 Jun 2016 18:32:42 +0000 (18:32 +0000)]
docs: Fix code sample in /work: Set up Single-Purpose Devices
am:
f4973c28a5
* commit '
f4973c28a513b117bed6f3b7f5e2ffbd975d4f02':
docs: Fix code sample in /work: Set up Single-Purpose Devices
Change-Id: I2e2f851ddf9208d3a734913369e8ece1fe199cfe
Bill Yi [Fri, 3 Jun 2016 18:32:27 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
10e29e0730 -s ours
am:
cc44ccf2f9 -s ours
* commit '
cc44ccf2f9e74d6c6138ee4b40ebffecfafde1cf':
Change-Id: I396bbeaa1a0ead5999e96991cdc7471ab0cd283d
Bill Yi [Fri, 3 Jun 2016 18:32:22 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
93bc210b3f -s ours
am:
6c4a3962e7 -s ours
* commit '
6c4a3962e7090451da516c56a6da0b3c816e046d':
Change-Id: Id92c6f1f23c7f97d5c312a1df8910b5a30bede61
Bill Yi [Fri, 3 Jun 2016 18:16:07 +0000 (18:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
10e29e0730 -s ours
am:
27bdfbf794 -s ours
* commit '
27bdfbf7946eb3e3b760169f85189168eebe60f6':
Import translations. DO NOT MERGE
Change-Id: If07970d05f867718116d0c3aebebad92a9840a12
Bill Yi [Fri, 3 Jun 2016 18:15:58 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
93bc210b3f -s ours
am:
373ad6f5a1 -s ours
* commit '
373ad6f5a1f0e98516a713423302b73a0d82f191':
Import translations. DO NOT MERGE
Change-Id: I5498cfed6c0e6e4453c38b1f81969d9ca4e1c4b2
Android Build Merger (Role) [Fri, 3 Jun 2016 18:12:44 +0000 (18:12 +0000)]
Merge "Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am:
cd44a32dfe am:
564dc9d0f7" into nyc-mr1-dev-plus-aosp
Pavlin Radoslavov [Fri, 3 Jun 2016 18:12:17 +0000 (11:12 -0700)]
resolve merge conflicts of
9eb77405 to nyc-dev-plus-aosp
Change-Id: I93f0fc1c427b02b0c864901f0a55e4cfaba35032
TreeHugger Robot [Fri, 3 Jun 2016 18:10:15 +0000 (18:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Eino-Ville Talvala [Fri, 3 Jun 2016 18:10:09 +0000 (18:10 +0000)]
Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am:
cd44a32dfe
am:
564dc9d0f7
* commit '
564dc9d0f7ef869a61b8825d844d7812fdb6f058':
Camera2: Update lensShadingMap documentation
Change-Id: I2ae7341a799cd78749f3c5b460f48b693780b03b
Eino-Ville Talvala [Fri, 3 Jun 2016 18:09:32 +0000 (18:09 +0000)]
Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am:
cd44a32dfe
am:
02c43050af
* commit '
02c43050af6fb528882af36d5f867abe071eebf0':
Camera2: Update lensShadingMap documentation
Change-Id: If3dbbf28d8024a10f1cd8dc0d93a0a04178474dd
Billy Lamberta [Thu, 2 Jun 2016 22:52:29 +0000 (15:52 -0700)]
docs: Fix code sample in /work: Set up Single-Purpose Devices
bug:
29095115
Change-Id: I7af38925ce24124d0b48368d9a0436b2d60995b5
Wang Xiaolei [Fri, 3 Jun 2016 18:08:15 +0000 (18:08 +0000)]
Merge "New prebuilt" into nyc-dev
Wang Xiaolei [Fri, 3 Jun 2016 18:08:15 +0000 (18:08 +0000)]
Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev
Fyodor Kupolov [Fri, 3 Jun 2016 18:03:03 +0000 (11:03 -0700)]
Delete account from DE and CE databases
When authenticator no longer exists and the user is unlocked, we should
remove accounts from both tables in a single transaction.
Bug:
28910995
Change-Id: Ibabf5d3e5ba561ffb3dda03aef99e358e2f71c58
Bill Yi [Fri, 3 Jun 2016 18:02:46 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
10e29e0730 -s ours
* commit '
10e29e0730c21cb8a2cfe74b43792fa3a5705195':
Import translations. DO NOT MERGE
Change-Id: I52252de40753f1e8b6bc38f738f5385bd1168f73
OSDN Git Service
