OSDN Git Service
Selim Cinek [Fri, 10 Feb 2017 00:59:45 +0000 (00:59 +0000)]
Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev am:
fbf2e0fb2c
am:
0fe3d064a3
Change-Id: I3b86cc62c28c8086ed57505581c33d7b578f893d
TreeHugger Robot [Fri, 10 Feb 2017 00:57:03 +0000 (00:57 +0000)]
Merge "Revert "Camera2: Temporarily remove surface size 0 check""
TreeHugger Robot [Fri, 10 Feb 2017 00:36:42 +0000 (00:36 +0000)]
Merge "Zygote: Restore GL preload"
Selim Cinek [Fri, 10 Feb 2017 00:12:48 +0000 (00:12 +0000)]
Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev
am:
fbf2e0fb2c
Change-Id: Ib1c45af5ffea1d09e14ac5daac61a1046d2594a2
Selim Cinek [Fri, 10 Feb 2017 00:06:39 +0000 (00:06 +0000)]
Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev
Andreas Gampe [Thu, 9 Feb 2017 23:17:14 +0000 (23:17 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
Jesse Hall [Thu, 9 Feb 2017 22:43:14 +0000 (14:43 -0800)]
Zygote: Restore GL preload
Preloading GLES drivers in Zygote was removed previously since it is
incompatible with updatable drivers. That caused some app startup
latency and system memory use regressions. This change re-adds GLES
driver preloading, but only on devices that don't support driver
updates.
Bug:
34611670
Bug:
35052548
Test: boot angler, systrace of Calculator app startup
Change-Id: Ibdc6b3c0ba4473574722641d4bfad4b375f908a3
TreeHugger Robot [Thu, 9 Feb 2017 22:33:48 +0000 (22:33 +0000)]
Merge "Remove downloads backup related Settings."
Adrian Roos [Thu, 9 Feb 2017 22:28:57 +0000 (22:28 +0000)]
Merge "Dependency: Make non-class dependencies type-safe"
TreeHugger Robot [Thu, 9 Feb 2017 22:06:33 +0000 (22:06 +0000)]
Merge "Disable touch slop for generated gesture events"
Selim Cinek [Wed, 8 Feb 2017 20:51:59 +0000 (12:51 -0800)]
Fixed an issue where the emergency affordance didn't show
The state wheather the sim affordance was needed before was
loaded but not saved locally if it didn't change, so any
further requests would have the default values if it stayed
true.
Test: add india sim, go into airplane mode, reboot, see emergency
button
Fixes:
34370542
Change-Id: I9da1f5ca8025df6c2618ab467e937cf5cf9aa132
Chad Brubaker [Thu, 9 Feb 2017 21:33:16 +0000 (21:33 +0000)]
Merge "Add permission for instant apps creating foreground services"
Andreas Gampe [Wed, 8 Feb 2017 03:44:37 +0000 (19:44 -0800)]
Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit
Move methods where they belong.
(cherry picked from commit
4e66db8d0c60e89f3a87bb05f38f82bda032ff0f)
Test: m
Test: Device boots
Change-Id: I805c6493078e960ff5b70d84dd93d2da6c7aa797
Shuzhen Wang [Thu, 9 Feb 2017 21:13:04 +0000 (13:13 -0800)]
Revert "Camera2: Temporarily remove surface size 0 check"
This reverts commit
bdabb0f582ddc4d9fe3df63030bdbe8e0a74348e.
Bug:
35027811
Test: Use camera from hangouts
Chris Tate [Thu, 9 Feb 2017 20:47:29 +0000 (20:47 +0000)]
Merge "Check bg persistent-app policy against base uid, not nominal"
Dianne Hackborn [Thu, 9 Feb 2017 20:42:07 +0000 (20:42 +0000)]
Merge "Fix issue #
34592078: Mobile broadcast crash observed randomly..."
Adrian Roos [Thu, 9 Feb 2017 18:58:25 +0000 (19:58 +0100)]
Dependency: Make non-class dependencies type-safe
Introduces a new DependencyKey<V> type which allows
referring to non-class dependencies in a type-safe
way. This also improves performance because we no
longer need to perform string comparisons.
Test: runtest systemui
Change-Id: Idc948855a85a1899be41e7f0170c40e73e525024
Greg Plesur [Thu, 9 Feb 2017 20:10:04 +0000 (20:10 +0000)]
Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94 am:
0265687aef" into nyc-mr2-dev-plus-aosp
am:
1f26fadba7
Change-Id: Ia2ff41983c4b04f11e22c95fd4659bdd0521a1f6
Greg Plesur [Thu, 9 Feb 2017 20:09:52 +0000 (20:09 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94 am:
0265687aef
am:
d5c031c75b
Change-Id: Ie80bb180876c59bf28bde509feb97b2c7ae280cc
Greg Plesur [Thu, 9 Feb 2017 20:08:26 +0000 (20:08 +0000)]
Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94 am:
89085b1593" into nyc-mr2-dev-plus-aosp
am:
a55677651f
Change-Id: I5f26af7cedfeab861acae935af965392ef3ac810
Greg Plesur [Thu, 9 Feb 2017 20:08:20 +0000 (20:08 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94 am:
89085b1593
am:
7d297e7761
Change-Id: I73677c19bda940dc352daba699ed68b8d3a3d575
Greg Plesur [Thu, 9 Feb 2017 20:07:18 +0000 (20:07 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am:
735b4dc0af am:
968477129c
am:
e25194b067
Change-Id: Icce21145f9e86060a96c44064e63ac5416b934e7
Greg Plesur [Thu, 9 Feb 2017 20:06:10 +0000 (20:06 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am:
735b4dc0af am:
d78a0d21cb
am:
82a3793269
Change-Id: I3f7fe9ba2c572eb0dda23386a62c50f58a6a08f9
Jeff Sharkey [Thu, 9 Feb 2017 20:04:47 +0000 (20:04 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours am:
966e600365 -s ours" into nyc-mr2-dev-plus-aosp
am:
3b7ee3598f -s ours
Change-Id: Iab23629aac79aa226a1d21508b4db9648537954b
Jeff Sharkey [Thu, 9 Feb 2017 20:04:42 +0000 (20:04 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours am:
966e600365 -s ours
am:
91aac0db54 -s ours
Change-Id: I67a75bf0e4fa073579420abc02d58735c606ad91
Jeff Sharkey [Thu, 9 Feb 2017 20:03:29 +0000 (20:03 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours am:
6d4af9c7f8 -s ours
am:
bbdec11843 -s ours
Change-Id: I57e2773891641ffa9d418d1cae70f3f234ad12f2
Paul Duffin [Thu, 9 Feb 2017 20:02:25 +0000 (20:02 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am:
621ebe692f am:
a2c92b0b88 am:
c1a93884dc
am:
8faed45024
Change-Id: I9d047f2e7bd8dfb14bf7b1f8c82ce6721e105198
Android Build Merger (Role) [Thu, 9 Feb 2017 19:58:17 +0000 (19:58 +0000)]
Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94 am:
0265687aef" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Thu, 9 Feb 2017 19:58:11 +0000 (19:58 +0000)]
Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94 am:
89085b1593" into nyc-mr2-dev-plus-aosp
Greg Plesur [Thu, 9 Feb 2017 19:57:34 +0000 (19:57 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94
am:
0265687aef
Change-Id: I4cd33b9e688d90d8555b91c6547dbffe3099e0ae
Greg Plesur [Thu, 9 Feb 2017 19:57:28 +0000 (19:57 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am:
5659b15a94
am:
89085b1593
Change-Id: I50b457b5c6b5614d8b7c450b3ee6f7e375478194
Greg Plesur [Thu, 9 Feb 2017 19:56:28 +0000 (19:56 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am:
735b4dc0af
am:
968477129c
Change-Id: I623dd515c8eae81b4146d67c83007fc5213561a2
Greg Plesur [Thu, 9 Feb 2017 19:53:06 +0000 (19:53 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked(). am:
735b4dc0af
am:
d78a0d21cb
Change-Id: I2e45ee1174cb287d8ce142ac4176148ceca5b248
Christopher Tate [Thu, 9 Feb 2017 19:32:28 +0000 (11:32 -0800)]
Check bg persistent-app policy against base uid, not nominal
SysUI, for example, needs to be able to start services in secondary
users, and in those users they run as the user-appropriate decorated
uid.
Bug
35200453
Test: verify user switch behavior via logging
Change-Id: Ia154f140e315fd97aed414c6444ba550632eb610
Android Build Merger (Role) [Thu, 9 Feb 2017 19:50:56 +0000 (19:50 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours am:
966e600365 -s ours" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Thu, 9 Feb 2017 19:50:10 +0000 (19:50 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours
am:
966e600365 -s ours
Change-Id: Ia3e044a2c4e2c71505d9666fbe0f3a0552f5e14f
Greg Plesur [Thu, 9 Feb 2017 19:50:03 +0000 (19:50 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
am:
5659b15a94
Change-Id: I9bb30911e82207da68c3c5f088ef9efd1edf75ca
Greg Plesur [Thu, 9 Feb 2017 19:50:01 +0000 (19:50 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
am:
5659b15a94
Change-Id: I4bb6bc892ea172b7bda1ccc5dd840de128908223
Jeff Sharkey [Thu, 9 Feb 2017 19:50:01 +0000 (19:50 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours am:
31c7fa003d -s ours
am:
6d4af9c7f8 -s ours
Change-Id: I5e6c70874400b8239dfc4be958a002d964f3d204
Greg Plesur [Thu, 9 Feb 2017 19:49:58 +0000 (19:49 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
am:
735b4dc0af
Change-Id: Iafcc772f7f9c8111d26ebc48af67e104848e0885
Greg Plesur [Thu, 9 Feb 2017 19:49:58 +0000 (19:49 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
am:
735b4dc0af
Change-Id: I5c8ca6d0a63af83cde91c17d10a634469c726442
Jeff Sharkey [Thu, 9 Feb 2017 19:45:35 +0000 (19:45 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours
am:
31c7fa003d -s ours
Change-Id: I69602a5fbca3fd966c2bc8ab900b004308ce5f41
Jeff Sharkey [Thu, 9 Feb 2017 19:45:34 +0000 (19:45 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours am:
b30169299b -s ours
am:
31c7fa003d -s ours
Change-Id: Ia19b5ec4e496b8c87461081a23aef6335fe45725
Greg Plesur [Thu, 9 Feb 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
Jeff Sharkey [Thu, 9 Feb 2017 19:41:31 +0000 (19:41 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
78f2e38a12 -s ours
am:
b30169299b -s ours
Change-Id: Iac47439b256367683e44d09042996ad060c3c43d
Paul Duffin [Thu, 9 Feb 2017 19:37:26 +0000 (19:37 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am:
621ebe692f am:
a2c92b0b88
am:
c1a93884dc
Change-Id: Icce543cd86f83bff8c2e80bf7ef492d22c9cf2dc
Jeff Sharkey [Thu, 9 Feb 2017 19:37:23 +0000 (19:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
78f2e38a12 -s ours
Change-Id: I51385a2b84bfc4e0fa387ceb644be523ca55ced3
Paul Duffin [Thu, 9 Feb 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am:
621ebe692f
am:
a2c92b0b88
Change-Id: I605588603280ff0b4ebc1088c6c1f1c933c1e657
Paul Duffin [Thu, 9 Feb 2017 19:28:25 +0000 (19:28 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
am:
621ebe692f
Change-Id: Ifc6e7ac4f4a1bfc8c592d3b956ac985e9dd6e0ea
Paul Duffin [Thu, 9 Feb 2017 19:18:34 +0000 (19:18 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
Dianne Hackborn [Thu, 9 Feb 2017 19:05:11 +0000 (11:05 -0800)]
Fix issue #
34592078: Mobile broadcast crash observed randomly...
...when using device on mobile data
Whitelist CellBroadcastReceiver, this is a core OS component anyway
so this probably makes sense.
Test: manual
Change-Id: I1560093640e81064ad123ff0bbcb307583fc47c6
TreeHugger Robot [Thu, 9 Feb 2017 19:03:15 +0000 (19:03 +0000)]
Merge "Switch fragment tests to use TestableLooper"
TreeHugger Robot [Thu, 9 Feb 2017 18:53:59 +0000 (18:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Felipe Leme [Thu, 9 Feb 2017 18:17:50 +0000 (18:17 +0000)]
Merge "Guarded access to mCallback and check for null before using it."
TreeHugger Robot [Thu, 9 Feb 2017 18:16:13 +0000 (18:16 +0000)]
Merge "Add a new setting to store the network recommendation app."
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug:
33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
Merged-In: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Thu, 9 Feb 2017 17:57:51 +0000 (17:57 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd am:
99755cb458 am:
2b9ee48dae
am:
70fd2f7197 -s ours
Change-Id: Ie6ddc1b5d9bc8ffeee147ac6734c2b561fe7b48f
Jeff Sharkey [Thu, 9 Feb 2017 17:54:24 +0000 (17:54 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd am:
99755cb458 am:
0a2374524a" into nyc-mr2-dev-plus-aosp
am:
37115274c0 -s ours
Change-Id: Ieb469af9a2748809f428394db82c1694699fc9f2
Jeff Sharkey [Thu, 9 Feb 2017 17:54:19 +0000 (17:54 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd am:
99755cb458 am:
0a2374524a
am:
b697587f20 -s ours
Change-Id: Ice8c2db54cd98fd642fcdfeb96c8f6e87cc2c989
Jeff Sharkey [Thu, 9 Feb 2017 17:53:09 +0000 (17:53 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675 am:
14b308de91 am:
19fd8e3f06
am:
983dc41c8d -s ours
Change-Id: Ie760d001d92437ea46781644a5fd780a9a9eca92
Jeff Sharkey [Thu, 9 Feb 2017 17:50:15 +0000 (17:50 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd am:
99755cb458
am:
2b9ee48dae
Change-Id: I2d6e3e455df562561615c539474a8368c1371830
Felipe Leme [Thu, 9 Feb 2017 17:47:18 +0000 (17:47 +0000)]
Merge "Improved some toString() methods."
Android Build Merger (Role) [Thu, 9 Feb 2017 17:47:11 +0000 (17:47 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd am:
99755cb458 am:
0a2374524a" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Thu, 9 Feb 2017 17:46:20 +0000 (17:46 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd am:
99755cb458
am:
0a2374524a
Change-Id: Idab19b2a8cecbcaf3f1b63c3c4b0d0edb388f260
Jeff Sharkey [Thu, 9 Feb 2017 17:46:19 +0000 (17:46 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675 am:
14b308de91 am:
473b52eb62
am:
d94624347f -s ours
Change-Id: I7f15e9458858982f8e572880c4c50af0bddd9d82
Jeff Sharkey [Thu, 9 Feb 2017 17:45:13 +0000 (17:45 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675 am:
14b308de91
am:
19fd8e3f06
Change-Id: Ied0e990e32f09ee2ac7bcb9846f3589d00038204
Jeff Sharkey [Thu, 9 Feb 2017 17:44:19 +0000 (17:44 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd
am:
99755cb458
Change-Id: Ia8c7e13f716b2007298b1773f00f338f665c7678
Jeff Sharkey [Thu, 9 Feb 2017 17:42:09 +0000 (17:42 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675 am:
14b308de91
am:
473b52eb62
Change-Id: Ic9afb12547b271de6e423601131605b0d930e10b
Jeff Sharkey [Thu, 9 Feb 2017 17:41:44 +0000 (17:41 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e am:
47656a3cbd
am:
99755cb458
Change-Id: I0380911f9607eed5f10a6c497f273ccbc67b3721
Jeff Sharkey [Thu, 9 Feb 2017 17:39:14 +0000 (17:39 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675
am:
14b308de91
Change-Id: I3ae65230058cd51b4efb06358dae35dce419c04b
Jeff Sharkey [Thu, 9 Feb 2017 17:37:47 +0000 (17:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours am:
be0dab477e
am:
47656a3cbd
Change-Id: I5835528fe288b1ee117265d37e39fcfd0bbb301b
Jeff Sharkey [Thu, 9 Feb 2017 17:37:44 +0000 (17:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3eddf40675
am:
14b308de91
Change-Id: I428dcaa5e44364d30a51392c224ad68a6e455e2b
Jeff Sharkey [Thu, 9 Feb 2017 17:33:51 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
a78841ebd4 -s ours
am:
be0dab477e
Change-Id: I28971e3707b67f7f3e4a566fd4f8e891d7e8823b
Jeff Sharkey [Thu, 9 Feb 2017 17:33:43 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
3eddf40675
Change-Id: Ied7f446ac2e539654b9f7d5e1ab7cce8aec7390e
Jason Monk [Thu, 2 Feb 2017 18:08:31 +0000 (13:08 -0500)]
Switch fragment tests to use TestableLooper
Test: runtest systemui
Change-Id: Iccbbaca2ef02cb3f5b08eef66c6c939e4ec2a5eb
Jeff Sharkey [Thu, 9 Feb 2017 17:28:44 +0000 (17:28 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
a78841ebd4 -s ours
Change-Id: Iac6ae6f87a60318e4557b238c196c3b0627e95ab
Yohei Yukawa [Thu, 9 Feb 2017 16:55:00 +0000 (16:55 +0000)]
Merge "Eliminate out-of-sync IMM#mFullscreenMode error"
TreeHugger Robot [Thu, 9 Feb 2017 16:46:49 +0000 (16:46 +0000)]
Merge "avoid race condition on very fast tests"
Greg Plesur [Thu, 9 Feb 2017 16:06:24 +0000 (11:06 -0500)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
BUG:
34824902
Change-Id: I95fbe0a352c48a3fff5af57b91325901a16d3d89
Jeremy Joslin [Wed, 8 Feb 2017 18:45:30 +0000 (10:45 -0800)]
Add a new setting to store the network recommendation app.
Test: manual
Bug:
35095406
Change-Id: I3d0b7f3b977c0862969d61a4e46f12151eb15417
Felipe Leme [Wed, 8 Feb 2017 22:38:02 +0000 (14:38 -0800)]
Guarded access to mCallback and check for null before using it.
Fixes:
35143142
Test: manual verification
Test: CtsAutoFillServiceTestCases passes
Change-Id: I465538b896b617c518949611f963e350ee498f7b
TreeHugger Robot [Thu, 9 Feb 2017 16:17:15 +0000 (16:17 +0000)]
Merge "AAPT2: Fix pseudolocalization to respect <xliff:g>"
TreeHugger Robot [Thu, 9 Feb 2017 15:45:04 +0000 (15:45 +0000)]
Merge changes I348c18dc,I0c33d519
* changes:
SysUiLeaks: Detect leaks in TunerService
SysUiLeaks: Detect leaks of NotificationData.Entry
Jason Monk [Thu, 9 Feb 2017 15:43:15 +0000 (15:43 +0000)]
Merge "Add better method test handlers/loopers in sysui"
Paul Duffin [Thu, 9 Feb 2017 14:47:53 +0000 (14:47 +0000)]
Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
This partially reverts commit
3e5fbca0c57742f28f5c7e6bda6c3500b9471b47.
Bug:
35187548
Bug:
30188076
Bug:
35089332
Test: make checkbuild
Change-Id: I7ab4279aab604e3d56003b0a59867948aebabd28
Chris Wren [Wed, 8 Feb 2017 22:21:53 +0000 (17:21 -0500)]
avoid race condition on very fast tests
most of the use cases for this involve uiautomator tests,
which are slow anyway. In this case it may be possible for
the checkpoint to record the current time, and then the
test event arrive before the clock ticks over to the
next millisecond, which would cause them to be ignored.
If this fixes the flakiness we should consider a more gneeral fix.
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
Bug:
35138327
Change-Id: Idc4aec50df1a75be710c5a69522af058f7e68ec1
TreeHugger Robot [Thu, 9 Feb 2017 14:03:17 +0000 (14:03 +0000)]
Merge "SysUiLeaks: Add LeakDetector"
Shubham Ajmera [Thu, 9 Feb 2017 12:14:17 +0000 (12:14 +0000)]
Merge "Replace RandomAccessFile with BufferedInputStream"
Bill Yi [Thu, 9 Feb 2017 11:41:51 +0000 (11:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
740ddc38bc -s ours
am:
cde8fa7e9f -s ours
Change-Id: I540f10c9fa9e7c54aa5578551e1377ec68f0e28f
Bill Yi [Thu, 9 Feb 2017 11:40:51 +0000 (11:40 +0000)]
Import translations. DO NOT MERGE am:
d0bc779893 -s ours
am:
49e6b18eeb -s ours
Change-Id: Ib68c0f50355c4d87be79078542696de7e1e4cb4f
Bill Yi [Thu, 9 Feb 2017 11:36:58 +0000 (11:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
740ddc38bc -s ours
Change-Id: I967c516afc18ee97b2790cedd4747e8f93c57368
Bill Yi [Thu, 9 Feb 2017 11:36:52 +0000 (11:36 +0000)]
Import translations. DO NOT MERGE
am:
d0bc779893 -s ours
Change-Id: I06ce169e1bebd7c4543090b2ba0c3b119121d954
TreeHugger Robot [Thu, 9 Feb 2017 11:28:22 +0000 (11:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Peeyush Agarwal [Thu, 9 Feb 2017 11:17:20 +0000 (11:17 +0000)]
Merge "Extend MenuItem to allow modifier keys for shortcut"
Bill Yi [Thu, 9 Feb 2017 09:57:11 +0000 (01:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I751a4937bc2753f50aaf1177868c9199e8d201ec
Auto-generated-cl: translation import
Bill Yi [Thu, 9 Feb 2017 09:39:21 +0000 (01:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I148a1107957e81169b55693f0f7c6920e9143e9c
Auto-generated-cl: translation import
Adrian Roos [Fri, 3 Feb 2017 00:01:51 +0000 (16:01 -0800)]
SysUiLeaks: Detect leaks in TunerService
Bug:
34932615
Test: manual
Change-Id: I348c18dc4e5772637828c1f53f15c84ad4c39485
Adrian Roos [Fri, 3 Feb 2017 00:01:51 +0000 (16:01 -0800)]
SysUiLeaks: Detect leaks of NotificationData.Entry
Bug:
34932615
Test: manual
Change-Id: I0c33d5194fe94e99b7bebe3a04a3730e41575080
Adrian Roos [Fri, 3 Feb 2017 00:00:59 +0000 (16:00 -0800)]
SysUiLeaks: Add LeakDetector
Bug:
34932615
Test: runtest -x $ANDROID_BUILD_TOP/frameworks/base/packages/SystemUI/tests/src/com/android/systemui/util/leak/
Change-Id: Id4a9cbdaddc83ca3e25923eec33d53b6761c54cb
Martijn Coenen [Thu, 9 Feb 2017 08:55:20 +0000 (08:55 +0000)]
Merge "Don't generate and send reply object in oneway calls." am:
60f11f3d16 am:
14cc9c291e am:
53e5640589
am:
b2c70c8877
Change-Id: I3e3d29f938ac86852b1353697009dec9cad545ee
OSDN Git Service
