OSDN Git Service
Jeff Sharkey [Fri, 26 May 2017 01:09:53 +0000 (01:09 +0000)]
Merge "Offer listener to observe StrictMode violations." into oc-dev
am:
a6b7e0a679
Change-Id: I1610373c91aa4fc2a60732c51145b585b6372729
Bryce Lee [Fri, 26 May 2017 01:05:20 +0000 (01:05 +0000)]
Merge "Update ActivityStack#removeActivityFromHistoryLocked documentation." into oc-dev
am:
aa051df3b6
Change-Id: I4a8e9eb6452a40acdb0e9fc3a6a6db4908062b8b
Android Build Merger (Role) [Fri, 26 May 2017 01:02:21 +0000 (01:02 +0000)]
Merge changes from topic 'am-
d53708499f7e48cdb8a7bb84c3076b88' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'multinetwork_vndk' into oc-dev am:
cffee96a16
Move libandroid_net from Android.mk to Android.bp. am:
addb296226 -s ours
Lorenzo Colitti [Fri, 26 May 2017 01:01:21 +0000 (01:01 +0000)]
Merge changes from topic 'multinetwork_vndk' into oc-dev
am:
cffee96a16
Change-Id: I91cac262cdb6af6e441c4750636ec28a97f2ad1a
Lorenzo Colitti [Fri, 26 May 2017 00:59:52 +0000 (00:59 +0000)]
Move libandroid_net from Android.mk to Android.bp.
am:
addb296226 -s ours
Change-Id: Ie5c94188dfe3ea99a0ef3747c8b359c32e6176f0
Hugo Benichi [Fri, 26 May 2017 00:58:27 +0000 (00:58 +0000)]
Merge changes If4deb106,Ib25d7658 am:
0388f0e47b am:
41a57af66a
am:
ae278410f5
Change-Id: I4fa34b647e7b2408d4493cfb148ae7d8c24bd6e8
Hugo Benichi [Fri, 26 May 2017 00:51:23 +0000 (00:51 +0000)]
Merge changes If4deb106,Ib25d7658 am:
0388f0e47b
am:
41a57af66a
Change-Id: Ieea1398319d8235e823464239d233bf6f528126d
Hugo Benichi [Fri, 26 May 2017 00:43:06 +0000 (00:43 +0000)]
Merge changes If4deb106,Ib25d7658
am:
0388f0e47b
Change-Id: Id10b2a80388aff2307cefd95ffb5f2b4df5fbdc3
Hugo Benichi [Fri, 26 May 2017 00:34:03 +0000 (00:34 +0000)]
Merge changes If4deb106,Ib25d7658
* changes:
NsdService: do not use ContentResolver directly
@Ignore ConnectivityServiceTest#testRequestBenchmark
Android Build Merger (Role) [Thu, 25 May 2017 23:13:04 +0000 (23:13 +0000)]
Merge "Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev am:
cca181bfbb" into oc-dev-plus-aosp
Hyunyoung Song [Thu, 25 May 2017 23:12:19 +0000 (23:12 +0000)]
Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev
am:
cca181bfbb
Change-Id: Ie70026a3aec8155368d867b7b736634cf6492f44
Android Build Merger (Role) [Thu, 25 May 2017 23:12:05 +0000 (23:12 +0000)]
Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am:
25ce41cf4c am:
be34238840 am:
689edc736f" into oc-dev-plus-aosp
Oleksiy Avramchenko [Thu, 25 May 2017 23:10:24 +0000 (23:10 +0000)]
Merge "Force a light to be set for the first time" into oc-dev
am:
9ddb0f8691 -s ours
Change-Id: I45be47b28daa351915890459cbf9046a28d65812
Brad Ebinger [Thu, 25 May 2017 23:10:21 +0000 (23:10 +0000)]
Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am:
25ce41cf4c am:
be34238840
am:
689edc736f
Change-Id: Ifd9fc089d7165506f6953e810c040de868f5bafe
Selim Cinek [Thu, 25 May 2017 23:08:11 +0000 (23:08 +0000)]
Merge "Fixed memory leak with the inflater" into oc-dev
am:
3d5fd7a959
Change-Id: I90d93918d1b188d09f6d2cf3ed70ceed38b07086
Jeff Sharkey [Thu, 25 May 2017 23:07:04 +0000 (23:07 +0000)]
Merge "Offer listener to observe StrictMode violations." into oc-dev
Chet Haase [Thu, 25 May 2017 23:05:43 +0000 (23:05 +0000)]
Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev
am:
68311f8712
Change-Id: I5c5a18d57e5658262793f0bd67f8a9febda055cd
TreeHugger Robot [Thu, 25 May 2017 23:03:49 +0000 (23:03 +0000)]
Merge "Update ActivityStack#removeActivityFromHistoryLocked documentation." into oc-dev
Lorenzo Colitti [Thu, 25 May 2017 23:02:36 +0000 (23:02 +0000)]
Merge changes from topic 'multinetwork_vndk' into oc-dev
* changes:
Allow vendor code to link to libandroid_net.
Move libandroid_net from Android.mk to Android.bp.
Brad Ebinger [Thu, 25 May 2017 23:00:29 +0000 (23:00 +0000)]
Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am:
25ce41cf4c
am:
be34238840
Change-Id: Ie399093e992c7b15c72927080b5c20d378738785
TreeHugger Robot [Thu, 25 May 2017 22:55:51 +0000 (22:55 +0000)]
Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 22:54:59 +0000 (22:54 +0000)]
Merge "Force a light to be set for the first time" into oc-dev
Selim Cinek [Thu, 25 May 2017 22:54:08 +0000 (22:54 +0000)]
Merge "Fixed memory leak with the inflater" into oc-dev
Selim Cinek [Thu, 25 May 2017 22:53:54 +0000 (22:53 +0000)]
Merge "Fixed an issue when inflating too many notifications" into oc-dev
am:
3a6f2a30ce
Change-Id: Ic2a82150d08eb70762c08822b040860e79f66b0b
TreeHugger Robot [Thu, 25 May 2017 22:51:14 +0000 (22:51 +0000)]
Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev
Brad Ebinger [Thu, 25 May 2017 22:51:11 +0000 (22:51 +0000)]
Merge "Add IMEI_NOT_ACCEPTED error code for IMS"
am:
25ce41cf4c
Change-Id: Ic24b93e215995a18e1a2ecbb647af0cc8e1f67cb
Selim Cinek [Thu, 25 May 2017 22:42:11 +0000 (22:42 +0000)]
Merge "Fixed an issue when inflating too many notifications" into oc-dev
Chad Brubaker [Thu, 25 May 2017 22:36:15 +0000 (22:36 +0000)]
Merge "Handle install time ephemeral permissions" into oc-dev
am:
dc89202d1a
Change-Id: I4da687bd1f5008788e54cc03309a01b060d1829e
Brad Ebinger [Thu, 25 May 2017 22:31:51 +0000 (22:31 +0000)]
Merge "Add IMEI_NOT_ACCEPTED error code for IMS"
Jason Monk [Thu, 25 May 2017 22:30:40 +0000 (22:30 +0000)]
Merge "Add test to verify all sysui tests extend the right stuff" into oc-dev
am:
34b64f2559
Change-Id: I412152b803be5a4e70b018c38ec3bbda76a51a01
TreeHugger Robot [Thu, 25 May 2017 22:28:24 +0000 (22:28 +0000)]
Merge "Handle install time ephemeral permissions" into oc-dev
Julia Reynolds [Thu, 25 May 2017 22:28:32 +0000 (22:28 +0000)]
Merge "Allow the creation of IMPORTANCE_NONE channels" into oc-dev
am:
e6bf4f808d
Change-Id: Ie81e000348bd6a4e247c40681202965285f2584c
TreeHugger Robot [Thu, 25 May 2017 22:21:23 +0000 (22:21 +0000)]
Merge "Add test to verify all sysui tests extend the right stuff" into oc-dev
Hugo Benichi [Thu, 25 May 2017 04:49:32 +0000 (13:49 +0900)]
NsdService: do not use ContentResolver directly
This patch changes NsdService to call registerContentObserver in the
ContentResolver class indirectly through NsdSettings.
This allows to easily intercept it and mock it in unit tests, and solves
test failures on the internal master branch where
registerContentObserver uses final or static methods that cannot be
worked around.
Bug:
32561414
Bug:
62044295
Test: runtest -x frameworks/base/tests/net/../NsdServiceTest.java
Change-Id: If4deb106de551746babb70196b20f21ece478850
Hugo Benichi [Thu, 25 May 2017 04:42:31 +0000 (13:42 +0900)]
@Ignore ConnectivityServiceTest#testRequestBenchmark
Ignore the last remaining test in ConnectivityServiceTest with spurious
failures. testRequestBenchmark has some intrinsic chances of failure due
to the fact it attempts to assert elapsed time durations against a
reference target.
Bug:
32561414
Test: no functional change
Change-Id: Ib25d76581b47997b2ef84df3e6a9fd9224b85d92
TreeHugger Robot [Thu, 25 May 2017 22:14:31 +0000 (22:14 +0000)]
Merge "Allow the creation of IMPORTANCE_NONE channels" into oc-dev
Jaekyun Seok [Thu, 25 May 2017 22:05:51 +0000 (22:05 +0000)]
Merge "Add a function to verify if idmap is made from given target/overlay packages" into oc-dev
am:
a941e29c55
Change-Id: I47bf589cf849a81a310d0890156bf7c937dd354a
Jason Monk [Thu, 25 May 2017 21:52:02 +0000 (21:52 +0000)]
Merge "Fix up the QS gutter" into oc-dev
am:
78ee090f78
Change-Id: I84250204436869ad18365acc42688fd6455f94a4
TreeHugger Robot [Thu, 25 May 2017 21:50:52 +0000 (21:50 +0000)]
Merge "Add a function to verify if idmap is made from given target/overlay packages" into oc-dev
Adrian Roos [Thu, 25 May 2017 21:48:37 +0000 (21:48 +0000)]
Merge "AOD: Fix camera icon visibility" into oc-dev
am:
f3a50f1675
Change-Id: I012732902d2f076e247f69f297bc4613ad4d0e94
TreeHugger Robot [Thu, 25 May 2017 21:41:47 +0000 (21:41 +0000)]
Merge "Fix up the QS gutter" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 21:40:50 +0000 (21:40 +0000)]
Merge "AOD: Fix camera icon visibility" into oc-dev
Lorenzo Colitti [Wed, 17 May 2017 07:50:17 +0000 (16:50 +0900)]
Allow vendor code to link to libandroid_net.
This library contains only the multinetwork API, which is part
of the NDK and has long-term support. It is needed by any native
that wants to use network communications on a different network
than the default network, and thus is necessary for vendor code
such as IMS clients or carrier applications.
Bug:
37527489
Test: marlin builds and boots
Test: MultinetworkApiTest CTS tests passes
Change-Id: I2aa592d1d082aae410173adf2a09f6d1dd8092dc
Merged-In: I2aa592d1d082aae410173adf2a09f6d1dd8092dc
Lorenzo Colitti [Wed, 17 May 2017 07:46:02 +0000 (16:46 +0900)]
Move libandroid_net from Android.mk to Android.bp.
This is the first step of making libandroid_net available to
vendor code. This is a partial cherry-pick of ag/
2210044 that
only moves the build target (hence the Merged-In change ID).
Bug:
37527489
Test: marlin builds and boots
Change-Id: Id9e4d13d4e75f6f6381c675c4e9f72e9f4769d22
Merged-In: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
Bryce Lee [Thu, 25 May 2017 20:57:46 +0000 (13:57 -0700)]
Update ActivityStack#removeActivityFromHistoryLocked documentation.
Followup to ag/
2187696
Test: Documentation only
Bug:
37752430
Change-Id: I6e6a1e6727793037b398ef5b2da58d9efad4ada0
Bryce Lee [Thu, 25 May 2017 20:53:49 +0000 (20:53 +0000)]
Merge "Use cached keyguard flags during relaunch." into oc-dev
am:
9eb635c428
Change-Id: I33a077d03618fdebebdd36af2e0db103fbd7ce3d
Bryce Lee [Thu, 25 May 2017 20:51:09 +0000 (20:51 +0000)]
Merge "Do not remove task until all activities have been destroyed." into oc-dev
am:
f18c5862e8
Change-Id: Id35bc99e1c6871fc16935f901710c2f7b1fc567e
Bryce Lee [Thu, 25 May 2017 20:43:30 +0000 (20:43 +0000)]
Merge "Use cached keyguard flags during relaunch." into oc-dev
Bryce Lee [Thu, 25 May 2017 20:42:15 +0000 (20:42 +0000)]
Merge "Do not remove task until all activities have been destroyed." into oc-dev
Winson Chung [Thu, 25 May 2017 20:36:30 +0000 (20:36 +0000)]
Merge "Ensure that windows are drawn before starting transition into PiP." into oc-dev
am:
ef4e38f96f
Change-Id: If433030b4fdd9885fc67ee3025fc30fd60eb3880
TreeHugger Robot [Thu, 25 May 2017 20:30:21 +0000 (20:30 +0000)]
Merge "Ensure that windows are drawn before starting transition into PiP." into oc-dev
Mady Mellor [Thu, 25 May 2017 20:20:40 +0000 (20:20 +0000)]
Merge "Dont reset the menu state if the menu is showing during an update" into oc-dev
am:
814d666f76
Change-Id: I0b31d86447dd53236f5e4253cea79ab47902c7fe
TreeHugger Robot [Thu, 25 May 2017 20:08:54 +0000 (20:08 +0000)]
Merge "Don’t reset the menu state if the menu is showing during an update" into oc-dev
Mathieu Chartier [Thu, 25 May 2017 20:00:57 +0000 (20:00 +0000)]
Merge "Update preloaded classes for O" into oc-dev
am:
9fb12725f2
Change-Id: I27200ac2f8858f755d7ff1d9fa4cc7f7eb406705
Mathieu Chartier [Thu, 25 May 2017 19:54:38 +0000 (19:54 +0000)]
Merge "Update preloaded classes for O" into oc-dev
Kevin Chyn [Thu, 25 May 2017 19:53:16 +0000 (19:53 +0000)]
Merge "ClientMonitor should only send cancel() once to fp daemon" into oc-dev
am:
d3d1c558eb
Change-Id: Iff80bb545a1c75256f76541b09cc642796945cf9
TreeHugger Robot [Thu, 25 May 2017 19:45:45 +0000 (19:45 +0000)]
Merge "ClientMonitor should only send cancel() once to fp daemon" into oc-dev
Tyler Gunn [Thu, 25 May 2017 19:44:32 +0000 (19:44 +0000)]
Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev
am:
95f4f14e0b
Change-Id: If762616920b266064cd1ee5520d5778ebb1475a7
Selim Cinek [Thu, 25 May 2017 17:27:28 +0000 (10:27 -0700)]
Fixed memory leak with the inflater
Because min priority children could be removed from
their parents after the removal, a new inflation task
would be started, leading to the view being instantly
readded again. This lead to memory leaks.
It also fixes a bug where the inflation would not inflate
enough views that could lead to crashes / wrong layouts.
Finally there was a indexing error when handling removal
of group summaries.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java
Change-Id: Iac242946bd30060967ee7877560d40e63f39f996
Fixes:
62067645
Tyler Gunn [Thu, 25 May 2017 19:33:58 +0000 (19:33 +0000)]
Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev
Adrian Roos [Thu, 25 May 2017 19:33:17 +0000 (12:33 -0700)]
AOD: Fix camera icon visibility
Fixes a bug where the camera icon could become
visible in AOD even though it should not.
Fixes:
62038727
Test: Trigger ambient display, uninstall button provider plugin, observe camera button does not show
Change-Id: Ie97085dff58b6ecd0157126e30b86138f585d454
Sudheer Shanka [Thu, 25 May 2017 19:26:58 +0000 (19:26 +0000)]
Merge "[PackageManagerService]:Fix system app can't uninstall apps silently" into oc-dev
am:
975ee1f25a
Change-Id: I2872b5a97aa8912655505d0c180f70706002d10e
Jason Monk [Tue, 23 May 2017 14:42:59 +0000 (10:42 -0400)]
Add test to verify all sysui tests extend the right stuff
And then make it pass.
Test: runtest systemui
Fixes:
38500852
Change-Id: I377164219e4a4f4d1a99f11ef06da03c2b527eb0
Sudheer Shanka [Thu, 25 May 2017 19:17:44 +0000 (19:17 +0000)]
Merge "[PackageManagerService]:Fix system app can't uninstall apps silently" into oc-dev
Tony Mak [Thu, 25 May 2017 19:09:24 +0000 (19:09 +0000)]
Merge "Fix permission is not granted to work profile system app by default" into oc-dev
am:
0995b177ab
Change-Id: I0fa9263de3416837f361247ddd95b69cc70b1575
Julia Reynolds [Thu, 25 May 2017 19:03:53 +0000 (19:03 +0000)]
Merge "Fix backup and restore of package blocks" into oc-dev
am:
2686322e71
Change-Id: Ic6d42f58038d7a4feead2f5a3c2c03f11f71e79e
John Reck [Thu, 25 May 2017 19:01:10 +0000 (19:01 +0000)]
Merge "Creating HW bitmaps from RenderNode" into oc-dev
am:
d63b77c627
Change-Id: Ia95a9f190c36999f70fdadbe45e1774beab80988
Tony Mak [Thu, 25 May 2017 18:57:32 +0000 (18:57 +0000)]
Merge "Fix permission is not granted to work profile system app by default" into oc-dev
Felipe Leme [Thu, 25 May 2017 18:54:14 +0000 (18:54 +0000)]
Merge "docs: Clarifying code snippet for View.autoFill()" into oc-dev
am:
c8124cb94c
Change-Id: I10f0767e85c25e6257ab2d4f02e5a7d8a0ef6fac
TreeHugger Robot [Thu, 25 May 2017 18:48:56 +0000 (18:48 +0000)]
Merge "Fix backup and restore of package blocks" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 18:48:18 +0000 (18:48 +0000)]
Merge "Creating HW bitmaps from RenderNode" into oc-dev
Winson Chung [Wed, 24 May 2017 19:13:33 +0000 (12:13 -0700)]
Ensure that windows are drawn before starting transition into PiP.
- Building upon ag/
2125930, we ensure that all windows are drawn before
starting the enter PiP animation.
Bug:
37420370
Test: bit FrameworksServicesTests:com.android.server.wm.BoundsAnimationControllerTests
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I73fb71681f62bbc684efedbd3d40c3e1a670db46
Felipe Leme [Thu, 25 May 2017 18:39:09 +0000 (18:39 +0000)]
Merge "docs: Clarifying code snippet for View.autoFill()" into oc-dev
Erik Wolsheimer [Thu, 25 May 2017 18:22:57 +0000 (18:22 +0000)]
Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev
am:
4c6a49ed47
Change-Id: Ib92f2dbad240bae9f46a23aa61eb2b7d09a96896
Jason Monk [Wed, 24 May 2017 18:57:10 +0000 (14:57 -0400)]
Fix up the QS gutter
- Don't show when collapsed, show divider instead
- Don't show when no notifications
- Animate between states while expanding/collapsing
- Other visual cleanup
Test: visual
Change-Id: I923c963fa70d63601b6a181299b04c5fc49922bb
Fixes:
38199857
Fixes:
38483355
Fixes:
38409326
Fixes:
38417776
Makoto Onuki [Thu, 25 May 2017 18:19:18 +0000 (18:19 +0000)]
Merge "Working around bugreport crash issues" into oc-dev
am:
5176a4cda3
Change-Id: Id5f50a4fad73b51079685b86839ccbe9912c2148
TreeHugger Robot [Thu, 25 May 2017 18:10:22 +0000 (18:10 +0000)]
Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 18:07:23 +0000 (18:07 +0000)]
Merge "Working around bugreport crash issues" into oc-dev
Eino-Ville Talvala [Thu, 25 May 2017 17:25:34 +0000 (17:25 +0000)]
Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev
am:
906948e7e2
Change-Id: I0007db72b0ca923c0e42bbb6ddadf34e927b5612
Jason Monk [Thu, 25 May 2017 17:19:48 +0000 (17:19 +0000)]
Merge "Fix guest tint" into oc-dev
am:
70d4423eb6
Change-Id: I65d05cbf2b3cc31e5fb2376eb3ab9a0782cc0c9d
Eino-Ville Talvala [Thu, 25 May 2017 17:11:00 +0000 (17:11 +0000)]
Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev
Jason Monk [Thu, 25 May 2017 17:09:09 +0000 (17:09 +0000)]
Merge "Fix guest tint" into oc-dev
Jorim Jaggi [Thu, 25 May 2017 16:53:34 +0000 (16:53 +0000)]
Merge "Fix flaky tests" into oc-dev
am:
b80cffad4b
Change-Id: Ia78dac2c9333a89f48a998b8df9b0f12e78da71c
Dmitri Plotnikov [Thu, 25 May 2017 16:51:17 +0000 (16:51 +0000)]
Merge "Triggering quiescent reboot during OTA" into oc-dev
am:
d9417c53e0
Change-Id: I0b2b42d95d739701a367bd5d25bebbd64d033ad0
TreeHugger Robot [Thu, 25 May 2017 16:47:08 +0000 (16:47 +0000)]
Merge "Fix flaky tests" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 16:46:32 +0000 (16:46 +0000)]
Merge "Triggering quiescent reboot during OTA" into oc-dev
Steven Moreland [Thu, 25 May 2017 16:45:48 +0000 (16:45 +0000)]
Merge "HIDL: C++ Java parity" am:
475d9b283c am:
101aa88ad6
am:
5b33f9b441
Change-Id: I7a7ae9d03ad51248526f3e93884e99bf7bc9e0b5
Bryce Lee [Thu, 25 May 2017 14:52:12 +0000 (07:52 -0700)]
Use cached keyguard flags during relaunch.
It is possible for the display to be unfrozen before an
AppWindowToken is finished relaunching. This allows for other window
containers (such as the StatusBar) to influence the rotation when
unfreezing.
This changelist prevents the cached keyguard flag values for the
AppWindowToken when relaunching. This prevents incorrect values from
being reported during transient relaunch window states.
Fixes:
38262879
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests#testKeyguardFlagsDuringRelaunch
Change-Id: I2aa23ac282cf7626bb187c6cd1a4a3524f788877
Steven Moreland [Thu, 25 May 2017 16:39:40 +0000 (16:39 +0000)]
Merge "HIDL: C++ Java parity" am:
475d9b283c
am:
101aa88ad6
Change-Id: If341009ba5c22ec0e83170e856e83b23d8a925ce
Steven Moreland [Thu, 25 May 2017 16:34:21 +0000 (16:34 +0000)]
Merge "HIDL: C++ Java parity"
am:
475d9b283c
Change-Id: I8195a0a4de291f26c637f5cd6802d6bbaf0d17a3
Treehugger Robot [Thu, 25 May 2017 16:28:41 +0000 (16:28 +0000)]
Merge "HIDL: C++ Java parity"
Julia Reynolds [Mon, 22 May 2017 12:45:27 +0000 (08:45 -0400)]
Fix backup and restore of package blocks
-Restore block status for apps that already exist
E.g. apps on the system image
- Stop depending on appops, it's duplicative and
not backuped/restored
Fixes:
38340377
Test: runtest systemui-notification, toast and notification
cts tests, backup android, clear data on packages, restore android,
verify that blocked apps stay blocked.
Change-Id: I29a33d7db2701bd64a7b30411dcf77c0a2f321d1
Felipe Leme [Thu, 25 May 2017 14:38:10 +0000 (14:38 +0000)]
Merge "Autofill UI should still show when dataset authentication is cancelled." into oc-dev
am:
c368c0b5ab
Change-Id: I3fe0b21fc76ae8c0edf8c3a742fa4bdbd0173fb2
Felipe Leme [Thu, 25 May 2017 14:32:04 +0000 (14:32 +0000)]
Merge "Autofill UI should still show when dataset authentication is cancelled." into oc-dev
Neil Fuller [Thu, 25 May 2017 11:01:07 +0000 (11:01 +0000)]
Merge "Remove time_zones_by_country.xml file" am:
3436fd4833 am:
1541ef3712
am:
4e9c135a5a
Change-Id: I8d03ce9616c702d73fb6a807d45c58afd332b50b
Neil Fuller [Thu, 25 May 2017 10:54:07 +0000 (10:54 +0000)]
Merge "Remove time_zones_by_country.xml file" am:
3436fd4833
am:
1541ef3712
Change-Id: Iba095c44c332658f7eea448dcf653b46bce5d8e8
Neil Fuller [Thu, 25 May 2017 10:46:41 +0000 (10:46 +0000)]
Merge "Remove time_zones_by_country.xml file"
am:
3436fd4833
Change-Id: I75cf86290b0dcc5aa99b9d0ebacbc5aa07269aab
Neil Fuller [Thu, 25 May 2017 10:39:14 +0000 (10:39 +0000)]
Merge "Remove time_zones_by_country.xml file"
Erik Kline [Thu, 25 May 2017 09:14:17 +0000 (09:14 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" into oc-dev
am:
fc6e6d1372 -s ours
Change-Id: I44c8ac70d0d3c53e52807697e62c40474d5fa356
TreeHugger Robot [Thu, 25 May 2017 09:04:33 +0000 (09:04 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" into oc-dev
OSDN Git Service
