OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Add friction icon for metered networks." into oc-dev am: 38344ac4e9
Stephen Chen [Mon, 3 Apr 2017 18:51:46 +0000 (18:51 +0000)]
Merge "Add friction icon for metered networks." into oc-dev am: 38344ac4e9
am: aa0b33f065

Change-Id: Ib9da5f27610bd131dcd10ab12cb2d493023cbe14

7 years agoMerge "Ensuring multi-window callbacks contain new configuration and are in order...
Winson Chung [Mon, 3 Apr 2017 18:47:49 +0000 (18:47 +0000)]
Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev am: 34ecbaa991
am: 0ed0b685b4

Change-Id: I925a568a4bde9eaab06b227690094c6099b7dfff

7 years agoMerge "Add friction icon for metered networks." into oc-dev
Stephen Chen [Mon, 3 Apr 2017 18:40:19 +0000 (18:40 +0000)]
Merge "Add friction icon for metered networks." into oc-dev
am: 38344ac4e9

Change-Id: I4edf3bd9367de701ea3f161a0ff461d47e216186

7 years agoMerge "Fixing regression in PiP TV." into oc-dev am: 244e4854c3
Winson Chung [Mon, 3 Apr 2017 18:37:57 +0000 (18:37 +0000)]
Merge "Fixing regression in PiP TV." into oc-dev am: 244e4854c3
am: 3152f5b4e6

Change-Id: Ie53f7c78709d5b71bf26d746d1c0966b8afc5fbd

7 years agoMerge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev am: 57132a1513
Brad Ebinger [Mon, 3 Apr 2017 18:36:51 +0000 (18:36 +0000)]
Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev am: 57132a1513
am: 6f4841bd3b

Change-Id: I73d709b8763c0859b13c621d530d5614d93c8ca2

7 years agoMerge "Ensuring multi-window callbacks contain new configuration and are in order...
Winson Chung [Mon, 3 Apr 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev
am: 34ecbaa991

Change-Id: I76109d3ae5f9b6ad98860d62c889b042bb3f6562

7 years agoMerge "Fixing regression in PiP TV." into oc-dev
Winson Chung [Mon, 3 Apr 2017 18:33:50 +0000 (18:33 +0000)]
Merge "Fixing regression in PiP TV." into oc-dev
am: 244e4854c3

Change-Id: Id0d758849c8838f9f43958e43978246b9b8c5cec

7 years agoMerge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
Brad Ebinger [Mon, 3 Apr 2017 18:25:48 +0000 (18:25 +0000)]
Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
am: 57132a1513

Change-Id: Ic29e989b13f2a9d4d53b403f3bdc1b1c46145e45

7 years agoMerge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev am: e35d50622c
Chad Brubaker [Mon, 3 Apr 2017 18:25:36 +0000 (18:25 +0000)]
Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev am: e35d50622c
am: a8c068f723

Change-Id: Id57b91b68ce6a4e1f31e8670798b59b82593ea96

7 years agoMerge "Add friction icon for metered networks." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 18:23:56 +0000 (18:23 +0000)]
Merge "Add friction icon for metered networks." into oc-dev

7 years agoMerge "Fix some WM unit tests" into oc-dev am: 2c93764bee
Andrii Kulian [Mon, 3 Apr 2017 18:23:58 +0000 (18:23 +0000)]
Merge "Fix some WM unit tests" into oc-dev am: 2c93764bee
am: 45d534bf93

Change-Id: Ia81653887fbf9a712d0ed285fa91a0e3afe1bff6

7 years agoMerge "Ensuring multi-window callbacks contain new configuration and are in order...
Winson Chung [Mon, 3 Apr 2017 18:23:24 +0000 (18:23 +0000)]
Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev

7 years agoMerge "Use KB instead of kB." into oc-dev am: e8165eb4ba
Daniel Nishi [Mon, 3 Apr 2017 18:22:54 +0000 (18:22 +0000)]
Merge "Use KB instead of kB." into oc-dev am: e8165eb4ba
am: 2444e42e1c

Change-Id: Ic43b71522c28cdd2e7c73e7406f972b623bc4d54

7 years agoMerge "Fixing regression in PiP TV." into oc-dev
Winson Chung [Mon, 3 Apr 2017 18:22:35 +0000 (18:22 +0000)]
Merge "Fixing regression in PiP TV." into oc-dev

7 years agoMerge "Fix deleting Misc channel for o-aps" into oc-dev am: a906fb7b43
Geoffrey Pitsch [Mon, 3 Apr 2017 18:21:57 +0000 (18:21 +0000)]
Merge "Fix deleting Misc channel for o-aps" into oc-dev am: a906fb7b43
am: 635e4efa1c

Change-Id: I97ca05aff7bea5d0d99d19d29d17bdc00c8381be

7 years agoMerge "Expose instant app to exposed providers" into oc-dev am: 644648ebfd
Todd Kennedy [Mon, 3 Apr 2017 18:20:55 +0000 (18:20 +0000)]
Merge "Expose instant app to exposed providers" into oc-dev am: 644648ebfd
am: 58672aba18

Change-Id: I2a2b87d9203c55a905ec2dc5585a87b4fedbde98

7 years agoMerge "Disable sounds on menu button" into oc-dev am: 5c8832a983
Jason Monk [Mon, 3 Apr 2017 18:19:46 +0000 (18:19 +0000)]
Merge "Disable sounds on menu button" into oc-dev am: 5c8832a983
am: 3184cfce76

Change-Id: Ibeab08999de0480fe4dd7ca287996a9395df84e7

7 years agoMerge "Fix battery icon dark initialization" into oc-dev am: cb4ed821f2
Jason Monk [Mon, 3 Apr 2017 18:18:41 +0000 (18:18 +0000)]
Merge "Fix battery icon dark initialization" into oc-dev am: cb4ed821f2
am: 17e605aae8

Change-Id: I31c58ac77e4df9e32958659519229467a82d2f08

7 years agoMerge "Allow committing allowing state loss on detached FragmentManager." into oc...
George Mount [Mon, 3 Apr 2017 18:13:28 +0000 (18:13 +0000)]
Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev am: e9679db5e2
am: 834752d4b2

Change-Id: I8f60a0e8b45d6c9c0944b47d867cbb5727fafc7a

7 years agoMerge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
Chad Brubaker [Mon, 3 Apr 2017 18:13:27 +0000 (18:13 +0000)]
Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
am: e35d50622c

Change-Id: Ibe29b902356c271e4ca33da87ed908d427dfb46d

7 years agoMerge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
Brad Ebinger [Mon, 3 Apr 2017 18:12:37 +0000 (18:12 +0000)]
Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev

7 years agoMerge "Fix broken perf tests" into oc-dev am: 974b5b13b2
Diego Perez [Mon, 3 Apr 2017 18:10:52 +0000 (18:10 +0000)]
Merge "Fix broken perf tests" into oc-dev am: 974b5b13b2
am: 471872e4b8

Change-Id: I9941c82ab0467fd885262aba22078fef5fda8769

7 years agoMerge "QS: Add transient animations for bluetooth and wifi" into oc-dev am: a56b6e530a
Jason Monk [Mon, 3 Apr 2017 18:09:36 +0000 (18:09 +0000)]
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev am: a56b6e530a
am: f6e22d4f36

Change-Id: Ib70b009369497f3c11369b01093298bb287f432f

7 years agoMerge "Fix losing status bar icons on config changes" into oc-dev am: f244f7e1b8
Jason Monk [Mon, 3 Apr 2017 18:08:17 +0000 (18:08 +0000)]
Merge "Fix losing status bar icons on config changes" into oc-dev am: f244f7e1b8
am: 5c549b3a2a

Change-Id: I73db4793b09c095404e61e7b377579108116c5f2

7 years agoMerge "Fix some WM unit tests" into oc-dev
Andrii Kulian [Mon, 3 Apr 2017 18:07:30 +0000 (18:07 +0000)]
Merge "Fix some WM unit tests" into oc-dev
am: 2c93764bee

Change-Id: I7d2d610f3939eac1b271e45ae35457b7b71dc46a

7 years agoMerge "Use KB instead of kB." into oc-dev
Daniel Nishi [Mon, 3 Apr 2017 18:06:19 +0000 (18:06 +0000)]
Merge "Use KB instead of kB." into oc-dev
am: e8165eb4ba

Change-Id: I33784b0f9c681dcfdc2a1f03d707336a9729ae30

7 years agoMerge "Fix deleting Misc channel for o-aps" into oc-dev
Geoffrey Pitsch [Mon, 3 Apr 2017 18:05:06 +0000 (18:05 +0000)]
Merge "Fix deleting Misc channel for o-aps" into oc-dev
am: a906fb7b43

Change-Id: I5276632980c373a0bc1861915a10cecf29b6cce1

7 years agoMerge "Expose instant app to exposed providers" into oc-dev
Todd Kennedy [Mon, 3 Apr 2017 18:03:47 +0000 (18:03 +0000)]
Merge "Expose instant app to exposed providers" into oc-dev
am: 644648ebfd

Change-Id: I32fc7de9cd1a0823dd38e5103d85c47776bb1404

7 years agoMerge "Disable sounds on menu button" into oc-dev
Jason Monk [Mon, 3 Apr 2017 18:02:26 +0000 (18:02 +0000)]
Merge "Disable sounds on menu button" into oc-dev
am: 5c8832a983

Change-Id: I16aef7e38de6a154d051f539b9fc8c96db73958a

7 years agoMerge "Implement service filtering" into oc-dev am: 35110948b7
Todd Kennedy [Mon, 3 Apr 2017 18:02:24 +0000 (18:02 +0000)]
Merge "Implement service filtering" into oc-dev am: 35110948b7
am: 48a2f0036c

Change-Id: I479a1db354a7f61e669f67241a0648d843301e95

7 years agoMerge "Fix battery icon dark initialization" into oc-dev
Jason Monk [Mon, 3 Apr 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Fix battery icon dark initialization" into oc-dev
am: cb4ed821f2

Change-Id: I34cc7adb16ec21ba8c9cf210b3ca61b2c9506290

7 years agoMerge "Add app bounds to configuration." into oc-dev am: 7efe56b779
Bryce Lee [Mon, 3 Apr 2017 18:00:08 +0000 (18:00 +0000)]
Merge "Add app bounds to configuration." into oc-dev am: 7efe56b779
am: 59d1f8a024

Change-Id: Iae8e43872eee11214347cfb935793e9356a50e08

7 years agoMerge "standardize network policy notification IDs" into oc-dev am: ef3a28cb92
Chris Wren [Mon, 3 Apr 2017 17:58:54 +0000 (17:58 +0000)]
Merge "standardize network policy notification IDs" into oc-dev am: ef3a28cb92
am: 04b0e05bef

Change-Id: Ifd5acffff7b45e02d5ba404550e32e16b5003bd7

7 years agoMerge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
George Mount [Mon, 3 Apr 2017 17:57:27 +0000 (17:57 +0000)]
Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
am: e9679db5e2

Change-Id: I4192bc42bdc35ff29ac6e3c4ce2bb67f5a412c4b

7 years agoMerge "Switch cast over to support library dialog" into oc-dev am: de8cd0e8f5
Jason Monk [Mon, 3 Apr 2017 17:57:23 +0000 (17:57 +0000)]
Merge "Switch cast over to support library dialog" into oc-dev am: de8cd0e8f5
am: 4209e9d739

Change-Id: I5311fff98a4735bf79c1f147e5733c38caf9da37

7 years agoRevert "Temporarily bg-whitelist the default container package-cleaning service"...
Jorim Jaggi [Mon, 3 Apr 2017 17:56:10 +0000 (17:56 +0000)]
Revert "Temporarily bg-whitelist the default container package-cleaning service" am: 91232840aa
am: c4bfd5e751

Change-Id: I83a8d235fca0991f394cd9da899089a96bc0a7f3

7 years agoMerge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev am: 0c224f9674
Tony Mak [Mon, 3 Apr 2017 17:54:39 +0000 (17:54 +0000)]
Merge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev am: 0c224f9674
am: aa82698241

Change-Id: If67406031276a6d958a9c3261a3c6ef51907f2c4

7 years agoMerge "Fix broken perf tests" into oc-dev
Diego Perez [Mon, 3 Apr 2017 17:52:17 +0000 (17:52 +0000)]
Merge "Fix broken perf tests" into oc-dev
am: 974b5b13b2

Change-Id: Ic9442beef0e2bec7db53b8e6ef1ff47dc6d12769

7 years agoMerge "QS: Add transient animations for bluetooth and wifi" into oc-dev
Jason Monk [Mon, 3 Apr 2017 17:51:00 +0000 (17:51 +0000)]
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev
am: a56b6e530a

Change-Id: I43f7dafe192930ce5f3a78db5e586d62ba66a1c4

7 years agoMerge "Fix losing status bar icons on config changes" into oc-dev
Jason Monk [Mon, 3 Apr 2017 17:49:45 +0000 (17:49 +0000)]
Merge "Fix losing status bar icons on config changes" into oc-dev
am: f244f7e1b8

Change-Id: I08a75d88e6764703d4c450b9ee5f81a824e2adc9

7 years agoMerge "Prevent NPE when draw is called without bounds being set Test: unit test insid...
Hyunyoung Song [Mon, 3 Apr 2017 17:49:19 +0000 (17:49 +0000)]
Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev am: 891e03203c
am: d16d17881e

Change-Id: I96db9ee1a5bb9fc2085e43733638a6b21f50fe65

7 years agoMerge "Implement service filtering" into oc-dev
Todd Kennedy [Mon, 3 Apr 2017 17:46:59 +0000 (17:46 +0000)]
Merge "Implement service filtering" into oc-dev
am: 35110948b7

Change-Id: Ie19ae7075e8fe35857a60306452fe19b06bb1848

7 years agoMerge "Lower-level user enumeration; fix disabled bug." into oc-dev am: 713b7c6b53
Jeff Sharkey [Mon, 3 Apr 2017 17:44:51 +0000 (17:44 +0000)]
Merge "Lower-level user enumeration; fix disabled bug." into oc-dev am: 713b7c6b53
am: f00900d7d4

Change-Id: I81fdae7cc9a09fd8231cd1e2f30113cf02884b59

7 years agoMerge "We really want f_frsize and f_bavail." into oc-dev am: fd463121c6
Jeff Sharkey [Mon, 3 Apr 2017 17:43:10 +0000 (17:43 +0000)]
Merge "We really want f_frsize and f_bavail." into oc-dev am: fd463121c6
am: f9f7d71cc5

Change-Id: Ifa28cb4515d6e9e74380fe70d73aec292d126ac9

7 years agoMerge "Add app bounds to configuration." into oc-dev
Bryce Lee [Mon, 3 Apr 2017 17:41:40 +0000 (17:41 +0000)]
Merge "Add app bounds to configuration." into oc-dev
am: 7efe56b779

Change-Id: If871d90a72f675a93503e883135ebee77f12d971

7 years agoMerge "standardize network policy notification IDs" into oc-dev
Chris Wren [Mon, 3 Apr 2017 17:40:29 +0000 (17:40 +0000)]
Merge "standardize network policy notification IDs" into oc-dev
am: ef3a28cb92

Change-Id: I0a5f11c0068a6da11bbb18d7a6f8e42f00655d74

7 years agoMerge "Switch cast over to support library dialog" into oc-dev
Jason Monk [Mon, 3 Apr 2017 17:38:57 +0000 (17:38 +0000)]
Merge "Switch cast over to support library dialog" into oc-dev
am: de8cd0e8f5

Change-Id: I997130142d426967d60e9c384056c3aba1ea5af5

7 years agoRevert "Temporarily bg-whitelist the default container package-cleaning service"
Jorim Jaggi [Mon, 3 Apr 2017 17:37:40 +0000 (17:37 +0000)]
Revert "Temporarily bg-whitelist the default container package-cleaning service"
am: 91232840aa

Change-Id: I0fefe67edea6e5a0c435bbe73730d5ede3adee14

7 years agoMerge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev
Tony Mak [Mon, 3 Apr 2017 17:36:07 +0000 (17:36 +0000)]
Merge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev
am: 0c224f9674

Change-Id: I6dc643e93b2d542b407abd5aaa7d832df47e47f7

7 years agoMerge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
Chad Brubaker [Mon, 3 Apr 2017 17:34:03 +0000 (17:34 +0000)]
Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev

7 years agoMerge "Camera: add batching support to HAL1 recording path" into oc-dev am: e1df48d3a0
Yin-Chia Yeh [Mon, 3 Apr 2017 17:34:03 +0000 (17:34 +0000)]
Merge "Camera: add batching support to HAL1 recording path" into oc-dev am: e1df48d3a0
am: f9da2da1fe

Change-Id: I4681267c10af539ee9a433f3ccdc397894b8f552

7 years agoMerge "Fix some WM unit tests" into oc-dev
Andrii Kulian [Mon, 3 Apr 2017 17:33:56 +0000 (17:33 +0000)]
Merge "Fix some WM unit tests" into oc-dev

7 years agoMerge "Prevent NPE when draw is called without bounds being set Test: unit test insid...
Hyunyoung Song [Mon, 3 Apr 2017 17:32:51 +0000 (17:32 +0000)]
Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev
am: 891e03203c

Change-Id: I14746f95c369503f5515e5123a481798fc76197c

7 years agoMerge "Lower-level user enumeration; fix disabled bug." into oc-dev
Jeff Sharkey [Mon, 3 Apr 2017 17:29:45 +0000 (17:29 +0000)]
Merge "Lower-level user enumeration; fix disabled bug." into oc-dev
am: 713b7c6b53

Change-Id: Ic2edcfc0d30bc5429753c313d31703802e630851

7 years agoMerge "We really want f_frsize and f_bavail." into oc-dev
Jeff Sharkey [Mon, 3 Apr 2017 17:27:48 +0000 (17:27 +0000)]
Merge "We really want f_frsize and f_bavail." into oc-dev
am: fd463121c6

Change-Id: I55aebb3b452f4d41af7e5f54d0dff27e9bc6cca6

7 years agoMerge "Use KB instead of kB." into oc-dev
Daniel Nishi [Mon, 3 Apr 2017 17:25:09 +0000 (17:25 +0000)]
Merge "Use KB instead of kB." into oc-dev

7 years agoMerge "Camera: add batching support to HAL1 recording path" into oc-dev
Yin-Chia Yeh [Mon, 3 Apr 2017 17:24:40 +0000 (17:24 +0000)]
Merge "Camera: add batching support to HAL1 recording path" into oc-dev
am: e1df48d3a0

Change-Id: I8e43b2faf95002b33bd8b861b046cd15c02f38d3

7 years agoMerge "Fix deleting Misc channel for o-aps" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:53:49 +0000 (16:53 +0000)]
Merge "Fix deleting Misc channel for o-aps" into oc-dev

7 years agoMerge "Expose instant app to exposed providers" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:43:02 +0000 (16:43 +0000)]
Merge "Expose instant app to exposed providers" into oc-dev

7 years agoMerge "Disable sounds on menu button" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:37:44 +0000 (16:37 +0000)]
Merge "Disable sounds on menu button" into oc-dev

7 years agoMerge "Fix battery icon dark initialization" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:37:07 +0000 (16:37 +0000)]
Merge "Fix battery icon dark initialization" into oc-dev

7 years agoMerge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:34:12 +0000 (16:34 +0000)]
Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev

7 years agoFixing regression in PiP TV.
Winson Chung [Sat, 1 Apr 2017 02:42:32 +0000 (19:42 -0700)]
Fixing regression in PiP TV.

- Don't clobber the state if we are deferring resizing due to finishing
  activities.
- Fix issue with PiP tasks being visible after the stack is removed, due
  to it being put below a non-fullscreen task in the fullscreen stack.
  Instead just move it to the back of the stack.

Bug: 36592307
Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: Ia18fe155b8a045a8ffea84612fd08af3ef3982d8

7 years agoMerge "Fix broken perf tests" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 15:57:34 +0000 (15:57 +0000)]
Merge "Fix broken perf tests" into oc-dev

7 years agoMerge "QS: Add transient animations for bluetooth and wifi" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 15:37:13 +0000 (15:37 +0000)]
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev

7 years agoMerge "Launch Intents from QS security footer as current user"
TreeHugger Robot [Mon, 3 Apr 2017 15:10:32 +0000 (15:10 +0000)]
Merge "Launch Intents from QS security footer as current user"

7 years agoMerge "Fix losing status bar icons on config changes" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 15:05:34 +0000 (15:05 +0000)]
Merge "Fix losing status bar icons on config changes" into oc-dev

7 years agoMerge "Implement service filtering" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 14:45:52 +0000 (14:45 +0000)]
Merge "Implement service filtering" into oc-dev

7 years agoMerge "Add app bounds to configuration." into oc-dev
Bryce Lee [Mon, 3 Apr 2017 14:30:42 +0000 (14:30 +0000)]
Merge "Add app bounds to configuration." into oc-dev

7 years agoFix deleting Misc channel for o-aps
Geoffrey Pitsch [Mon, 3 Apr 2017 14:19:11 +0000 (10:19 -0400)]
Fix deleting Misc channel for o-aps

Change-Id: If5ebebcd1b983e12dee860801db578dfe882bd9c
Fixes: 36816111
Test: runtest systemui-notification

7 years agoFix broken perf tests
Diego Perez [Mon, 27 Mar 2017 15:49:17 +0000 (16:49 +0100)]
Fix broken perf tests

Do not dispose Bridge on tearDown. The concept of disposing the Bridge
only made sense when we were loading it dynamically. Some classes have
static initializers that will fail after the dispose (like Typeface).

Test: N/A
Change-Id: I9c934432232bda02a4d26425587096fb6dc957b0
(cherry picked from commit f1532e36e16e2b55f175a24f11df91cf344833ff)

7 years agoMerge "standardize network policy notification IDs" into oc-dev
Chris Wren [Mon, 3 Apr 2017 13:42:38 +0000 (13:42 +0000)]
Merge "standardize network policy notification IDs" into oc-dev

7 years agoMerge "Switch cast over to support library dialog" into oc-dev
Jason Monk [Mon, 3 Apr 2017 13:34:13 +0000 (13:34 +0000)]
Merge "Switch cast over to support library dialog" into oc-dev

7 years agoRevert "Temporarily bg-whitelist the default container package-cleaning service"
Jorim Jaggi [Mon, 3 Apr 2017 12:40:39 +0000 (14:40 +0200)]
Revert "Temporarily bg-whitelist the default container package-cleaning service"

Causes bootloop.

This reverts commit f16e7423c79c4ccccf43265a5b1966eb8e7f7be7.

7 years agoLaunch Intents from QS security footer as current user
Bartosz Fabianowski [Mon, 3 Apr 2017 11:29:12 +0000 (13:29 +0200)]
Launch Intents from QS security footer as current user

Intents triggered from QS should be resolved as the current user,
not as the user that QS is running as (which will always be user 0).
ActivityStarter knows how to do this and can handle this for us
automatically.

Bug: 36118203
Test: Manual

Change-Id: I48d880f0a17d7a9f218ab07ef807ad49ebeda624

7 years agoMerge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 11:06:53 +0000 (11:06 +0000)]
Merge "Revert "Whitelist ManagedProvisioning from bg check"" into oc-dev

7 years agoMerge "Add test coverage for NetworkSpecifiers." am: 9a029b5262 am: 0e068f6360 am...
Lorenzo Colitti [Mon, 3 Apr 2017 11:06:24 +0000 (11:06 +0000)]
Merge "Add test coverage for NetworkSpecifiers." am: 9a029b5262 am: 0e068f6360 am: 8ee38521bc
am: 391c97d506

Change-Id: Ia71b72cc10dba6bac7c8fbe1ab3c5f40bc5506ff

7 years agoMerge "Add test coverage for NetworkSpecifiers." am: 9a029b5262 am: 0e068f6360
Lorenzo Colitti [Mon, 3 Apr 2017 10:59:17 +0000 (10:59 +0000)]
Merge "Add test coverage for NetworkSpecifiers." am: 9a029b5262 am: 0e068f6360
am: 8ee38521bc

Change-Id: Ia7d36096f0e3f0b203d1d838043c03fcd1cea829

7 years agoMerge "Add test coverage for NetworkSpecifiers." am: 9a029b5262
Lorenzo Colitti [Mon, 3 Apr 2017 10:52:20 +0000 (10:52 +0000)]
Merge "Add test coverage for NetworkSpecifiers." am: 9a029b5262
am: 0e068f6360

Change-Id: I376b9011aaae7f0b8a2899a942d1a43e26605101

7 years agoMerge "Add test coverage for NetworkSpecifiers."
Lorenzo Colitti [Mon, 3 Apr 2017 10:45:22 +0000 (10:45 +0000)]
Merge "Add test coverage for NetworkSpecifiers."
am: 9a029b5262

Change-Id: Ia328b945af4c4f55ef560b33b00fa861b8f81b0d

7 years agoMerge "Add test coverage for NetworkSpecifiers."
Treehugger Robot [Mon, 3 Apr 2017 10:37:00 +0000 (10:37 +0000)]
Merge "Add test coverage for NetworkSpecifiers."

7 years agoMerge "Prevent NPE when draw is called without bounds being set Test: unit test insid...
TreeHugger Robot [Mon, 3 Apr 2017 09:52:13 +0000 (09:52 +0000)]
Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev

7 years agoMerge "ConnectivityService: simplify WakeLock management" am: c98db5caa2 am: 6db00a22...
Hugo Benichi [Mon, 3 Apr 2017 09:24:14 +0000 (09:24 +0000)]
Merge "ConnectivityService: simplify WakeLock management" am: c98db5caa2 am: 6db00a22b0 am: 56ca1705d6
am: e92a4ba79b

Change-Id: Id8ae92f0eec4284ff5ba59a4a8c2227e9a77765a

7 years agoMerge "ConnectivityService: simplify WakeLock management" am: c98db5caa2 am: 6db00a22b0
Hugo Benichi [Mon, 3 Apr 2017 09:17:18 +0000 (09:17 +0000)]
Merge "ConnectivityService: simplify WakeLock management" am: c98db5caa2 am: 6db00a22b0
am: 56ca1705d6

Change-Id: Iacc2e977c1eec2ebc9deb9395e1f77a62b57f070

7 years agoMerge "ConnectivityService: simplify WakeLock management" am: c98db5caa2
Hugo Benichi [Mon, 3 Apr 2017 09:10:44 +0000 (09:10 +0000)]
Merge "ConnectivityService: simplify WakeLock management" am: c98db5caa2
am: 6db00a22b0

Change-Id: I468e31800d5cfe1dd385d773fcc393b615cfa343

7 years agoMerge "ConnectivityService: simplify WakeLock management"
Hugo Benichi [Mon, 3 Apr 2017 09:03:13 +0000 (09:03 +0000)]
Merge "ConnectivityService: simplify WakeLock management"
am: c98db5caa2

Change-Id: I1e0ae930cd7a329febf21ff3fc83ad2d0a3be69b

7 years agoMerge "ConnectivityService: simplify WakeLock management"
Hugo Benichi [Mon, 3 Apr 2017 08:56:23 +0000 (08:56 +0000)]
Merge "ConnectivityService: simplify WakeLock management"

7 years agoAdd test coverage for NetworkSpecifiers.
Lorenzo Colitti [Mon, 3 Apr 2017 08:46:35 +0000 (17:46 +0900)]
Add test coverage for NetworkSpecifiers.

Tests various combinations of empty / non-empty NetworkSpecifiers
and changing specifiers on the fly.

Test: ConnectivityServiceTest passes
Bug: 27533960
Change-Id: Ibd6b4efc861dc51689e46f3882ba859223411bf0

7 years agoMerge "Lower-level user enumeration; fix disabled bug." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 08:36:04 +0000 (08:36 +0000)]
Merge "Lower-level user enumeration; fix disabled bug." into oc-dev

7 years agoMerge "We really want f_frsize and f_bavail." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 07:37:44 +0000 (07:37 +0000)]
Merge "We really want f_frsize and f_bavail." into oc-dev

7 years agoMerge "Camera: add batching support to HAL1 recording path" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 07:34:01 +0000 (07:34 +0000)]
Merge "Camera: add batching support to HAL1 recording path" into oc-dev

7 years agoPrevent NPE when draw is called without bounds being set
Hyunyoung Song [Mon, 3 Apr 2017 07:23:49 +0000 (00:23 -0700)]
Prevent NPE when draw is called without bounds being set
Test: unit test inside AdaptiveIconDrawableTest.java

Change-Id: Ic3260ce9c6bae595c7eba7be1cd7ae249939a1cf

7 years agoMerge "Process FuseAppLoop messages in Handler.Callback" into oc-dev am: cb9ceb3fd4
Daichi Hirono [Mon, 3 Apr 2017 07:07:03 +0000 (07:07 +0000)]
Merge "Process FuseAppLoop messages in Handler.Callback" into oc-dev am: cb9ceb3fd4
am: fd88a3aba7

Change-Id: I14919d6eef09fc3b4fc0f94faae2b6c8c1222abc

7 years agoMerge "Process FuseAppLoop messages in Handler.Callback" into oc-dev
Daichi Hirono [Mon, 3 Apr 2017 07:00:35 +0000 (07:00 +0000)]
Merge "Process FuseAppLoop messages in Handler.Callback" into oc-dev
am: cb9ceb3fd4

Change-Id: I8708c1e60300c5384071106d9b3f75a534d1fbf6

7 years agoMerge "Process FuseAppLoop messages in Handler.Callback" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 06:54:59 +0000 (06:54 +0000)]
Merge "Process FuseAppLoop messages in Handler.Callback" into oc-dev

7 years agoMerge "Process FuseAppLoop messages in Handler.Callback"
TreeHugger Robot [Mon, 3 Apr 2017 06:49:00 +0000 (06:49 +0000)]
Merge "Process FuseAppLoop messages in Handler.Callback"

7 years agoEnforce PACKAGE_USAGE_STATS for usage data. am: 6df866a851
Jeff Sharkey [Mon, 3 Apr 2017 06:27:05 +0000 (06:27 +0000)]
Enforce PACKAGE_USAGE_STATS for usage data. am: 6df866a851
am: 979f227fb9

Change-Id: Ia3aaf773b4defb4b1399544ff7475cd4142f16aa

7 years agoConsistent dump() permission checking. am: fe9a53bc45
Jeff Sharkey [Mon, 3 Apr 2017 06:26:04 +0000 (06:26 +0000)]
Consistent dump() permission checking. am: fe9a53bc45
am: 020de02854

Change-Id: Iffbf78a7b48cea41ed4b0763f2452738e084225c

7 years agoEnforce PACKAGE_USAGE_STATS for usage data.
Jeff Sharkey [Mon, 3 Apr 2017 06:19:57 +0000 (06:19 +0000)]
Enforce PACKAGE_USAGE_STATS for usage data.
am: 6df866a851

Change-Id: I52d982ee864903ca93e889aa03f6315438dc6c4b

7 years agoConsistent dump() permission checking.
Jeff Sharkey [Mon, 3 Apr 2017 06:19:02 +0000 (06:19 +0000)]
Consistent dump() permission checking.
am: fe9a53bc45

Change-Id: I300f8bc07e1266b9e78f56d085cd458862176a85