OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "WifiManager: get startLOHS packageName" into oc-dev am: 07f580eaff
Rebecca Silberstein [Mon, 22 May 2017 17:17:00 +0000 (17:17 +0000)]
Merge "WifiManager: get startLOHS packageName" into oc-dev am: 07f580eaff
am: 5dceb97fd3

Change-Id: I47cac61d2d4f4b8d4c659bfc4bb764710f67b018

7 years agoMerge "WifiManager: get startLOHS packageName" into oc-dev
Rebecca Silberstein [Mon, 22 May 2017 17:04:26 +0000 (17:04 +0000)]
Merge "WifiManager: get startLOHS packageName" into oc-dev
am: 07f580eaff

Change-Id: I06d47557fd35f519fbfe5d1ee11ec02c5027e4c7

7 years agoMerge "Convert Shader to NativeAllocationRegistry"
John Reck [Mon, 22 May 2017 17:00:52 +0000 (17:00 +0000)]
Merge "Convert Shader to NativeAllocationRegistry"

7 years agoMerge "WifiManager: get startLOHS packageName" into oc-dev
Rebecca Silberstein [Mon, 22 May 2017 16:57:52 +0000 (16:57 +0000)]
Merge "WifiManager: get startLOHS packageName" into oc-dev

7 years agoMerge "Fix bad merge causing Recents to be started twice in succession." into oc...
Winson Chung [Mon, 22 May 2017 16:32:01 +0000 (16:32 +0000)]
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev am: 305c332c22
am: 75eab7fa16

Change-Id: I48f1fd5730232c6978fedfeb42bb07684d667da4

7 years agoMerge "Fix bad merge causing Recents to be started twice in succession." into oc-dev
Winson Chung [Mon, 22 May 2017 16:20:18 +0000 (16:20 +0000)]
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev
am: 305c332c22

Change-Id: I9fc712b5b5d96398177883b1979a3ea5744efa89

7 years agoMerge "Change camera lift sensor to trigger sensor"
Jonathan Solnit [Mon, 22 May 2017 16:19:36 +0000 (16:19 +0000)]
Merge "Change camera lift sensor to trigger sensor"

7 years agoMerge "Fix bad merge causing Recents to be started twice in succession." into oc-dev
Winson Chung [Mon, 22 May 2017 16:11:24 +0000 (16:11 +0000)]
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev

7 years agoMerge "Disallow starting activities without new task from non-activity context."...
Bryce Lee [Mon, 22 May 2017 14:58:30 +0000 (14:58 +0000)]
Merge "Disallow starting activities without new task from non-activity context." into oc-dev am: 3ebe54b3e6
am: b8bcdf50e4

Change-Id: Ib3a056213274cd3d7b86859be43893777f4230cb

7 years agoMerge "Disallow starting activities without new task from non-activity context."...
Bryce Lee [Mon, 22 May 2017 14:43:32 +0000 (14:43 +0000)]
Merge "Disallow starting activities without new task from non-activity context." into oc-dev
am: 3ebe54b3e6

Change-Id: I4a89ce60dad32f41f4e77b81a6af56c89845987a

7 years agoMerge "Disallow starting activities without new task from non-activity context."...
Bryce Lee [Mon, 22 May 2017 14:30:59 +0000 (14:30 +0000)]
Merge "Disallow starting activities without new task from non-activity context." into oc-dev

7 years agoMerge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev am: ed83139842
Phil Weaver [Mon, 22 May 2017 13:27:17 +0000 (13:27 +0000)]
Merge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev am: ed83139842
am: 204f535e2c

Change-Id: I16896585c4b4b1f064efb29631ca8c6684d3b76e

7 years agoMerge "[AWARE] Enhance debug logs"
Etan Cohen [Mon, 22 May 2017 13:24:52 +0000 (13:24 +0000)]
Merge "[AWARE] Enhance debug logs"

7 years agoMerge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev
Phil Weaver [Mon, 22 May 2017 13:13:34 +0000 (13:13 +0000)]
Merge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev
am: ed83139842

Change-Id: I7721cfee4ef04aa463a687b8223f881e9d153394

7 years agoMerge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev
Phil Weaver [Mon, 22 May 2017 13:03:39 +0000 (13:03 +0000)]
Merge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev

7 years agoMerge "Creat a new notification to avoid the mTetheredNotificationBuilder changed...
zhouzhijie [Mon, 22 May 2017 11:24:31 +0000 (11:24 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed" am: 99cf40a25a am: 3818d4187c am: b7681ecd46
am: 73e7a17a21

Change-Id: I0bceaab31760e89eb0968561b4358adbc4aec724

7 years agoMerge "Creat a new notification to avoid the mTetheredNotificationBuilder changed...
zhouzhijie [Mon, 22 May 2017 11:13:35 +0000 (11:13 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed" am: 99cf40a25a am: 3818d4187c
am: b7681ecd46

Change-Id: I95284107f41b8bc4f4eae0870796f85a8b0b178b

7 years agoMerge "Creat a new notification to avoid the mTetheredNotificationBuilder changed...
zhouzhijie [Mon, 22 May 2017 11:02:28 +0000 (11:02 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed" am: 99cf40a25a
am: 3818d4187c

Change-Id: Iafc7ccd9bdd120100ae4063d72379479693142f9

7 years agoMerge "Revert the system clock in the debug oc-dev" into oc-dev am: 4229cb80a0
Yipeng Cao [Mon, 22 May 2017 10:57:26 +0000 (10:57 +0000)]
Merge "Revert the system clock in the debug oc-dev" into oc-dev am: 4229cb80a0
am: 98af818d03

Change-Id: Id7aacffd3fa48d76003840fff8f4d48197eae936

7 years agoMerge "Creat a new notification to avoid the mTetheredNotificationBuilder changed"
zhouzhijie [Mon, 22 May 2017 10:52:28 +0000 (10:52 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed"
am: 99cf40a25a

Change-Id: I9d45fc368e746efa40df96c39719566a201dad45

7 years agoMerge "Revert the system clock in the debug oc-dev" into oc-dev
Yipeng Cao [Mon, 22 May 2017 10:47:28 +0000 (10:47 +0000)]
Merge "Revert the system clock in the debug oc-dev" into oc-dev
am: 4229cb80a0

Change-Id: Icef2e7fb527f90a44839b3f1a2f931760b6696b2

7 years agoMerge "Creat a new notification to avoid the mTetheredNotificationBuilder changed"
Treehugger Robot [Mon, 22 May 2017 10:41:38 +0000 (10:41 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed"

7 years agoMerge "Revert the system clock in the debug oc-dev" into oc-dev
TreeHugger Robot [Mon, 22 May 2017 10:36:34 +0000 (10:36 +0000)]
Merge "Revert the system clock in the debug oc-dev" into oc-dev

7 years agoMerge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am: a2663b0060 am: b04d7c...
Andre Eisenbach [Sat, 20 May 2017 00:56:16 +0000 (00:56 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am: a2663b0060 am: b04d7ceaeb am: a8ffb9fd3d
am: 0471a2975a

Change-Id: I98a1b0f3250e5f0bbfdb6310c2460894224cb64b

7 years agoMerge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am: a2663b0060 am: b04d7ceaeb
Andre Eisenbach [Sat, 20 May 2017 00:50:20 +0000 (00:50 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am: a2663b0060 am: b04d7ceaeb
am: a8ffb9fd3d

Change-Id: I4313e847de1e6cfd550bc9b1ca6a8c121b6c0403

7 years agoMerge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am: a2663b0060
Andre Eisenbach [Sat, 20 May 2017 00:43:16 +0000 (00:43 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am: a2663b0060
am: b04d7ceaeb

Change-Id: I66bdfd02f8d5322173ba85a2c427158a237cb215

7 years agoMerge "OBEX: Add required parameters TAG ID's for PBAP 1.2"
Andre Eisenbach [Sat, 20 May 2017 00:36:15 +0000 (00:36 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2"
am: a2663b0060

Change-Id: I015534f9fb860fd0f875bab3d9130de029dc16b9

7 years agoMerge "OBEX: Add required parameters TAG ID's for PBAP 1.2"
Andre Eisenbach [Sat, 20 May 2017 00:28:59 +0000 (00:28 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2"

7 years agoOBEX: Add required parameters TAG ID's for PBAP 1.2
Hemant Gupta [Sat, 17 Oct 2015 14:10:53 +0000 (19:40 +0530)]
OBEX: Add required parameters TAG ID's for PBAP 1.2

Add required OBEX application parameters TAGID's and length
declarations required to support PBAP 1.2 specification.

Test: Connected with Remote PBAP Client supporting PBAP 1.2 and
verified that connection and transfer happens over L2CAP.
Connected with Remote PBAP Client supporting PBAP 1.1 and
and verified that connection and transfer happens over RFCOMM.

Bug: 33011817
Change-Id: I8a772b0dddf6ecf74b057e12d7596421c0e0f558

7 years agoMerge "Gradient drawable bounds"
TreeHugger Robot [Sat, 20 May 2017 00:25:00 +0000 (00:25 +0000)]
Merge "Gradient drawable bounds"

7 years agoMerge "Address ConnectivityManager API comments." am: b5d6e45e8d am: b57db6ef97 am...
Hugo Benichi [Fri, 19 May 2017 23:46:46 +0000 (23:46 +0000)]
Merge "Address ConnectivityManager API comments." am: b5d6e45e8d am: b57db6ef97 am: 08ab9ea526
am: 275c1ac91c

Change-Id: I4ba08fdfca51cbc11866e941dab76f2926f796b1

7 years agoMerge "Address ConnectivityManager API comments." am: b5d6e45e8d am: b57db6ef97
Hugo Benichi [Fri, 19 May 2017 23:36:09 +0000 (23:36 +0000)]
Merge "Address ConnectivityManager API comments." am: b5d6e45e8d am: b57db6ef97
am: 08ab9ea526

Change-Id: I8e5e44043bb7efde3e21650e7edf3f121aff1e6e

7 years agoMerge "Address ConnectivityManager API comments." am: b5d6e45e8d
Hugo Benichi [Fri, 19 May 2017 23:24:56 +0000 (23:24 +0000)]
Merge "Address ConnectivityManager API comments." am: b5d6e45e8d
am: b57db6ef97

Change-Id: If38be1435c55c66890bb5c702a7b9b23240c0b64

7 years agoMerge "Address ConnectivityManager API comments."
Hugo Benichi [Fri, 19 May 2017 23:14:08 +0000 (23:14 +0000)]
Merge "Address ConnectivityManager API comments."
am: b5d6e45e8d

Change-Id: I4a29a929e2482d664a969ca38e5f73c3ed816175

7 years agoFix bad merge causing Recents to be started twice in succession.
Winson Chung [Fri, 19 May 2017 23:05:54 +0000 (16:05 -0700)]
Fix bad merge causing Recents to be started twice in succession.

Bug: 38449257
Test: Launch Recents, ensure it's not started twice...
Change-Id: I0da85ef53742981fd67e8f1d1b733060d8098498

7 years agoMerge "Address ConnectivityManager API comments."
Hugo Benichi [Fri, 19 May 2017 23:05:55 +0000 (23:05 +0000)]
Merge "Address ConnectivityManager API comments."

7 years agoMerge "Implement stopStreaming API for MBMS" am: e245bf9067 am: a7fffdc0d9 am: efa377cbb6
Hall Liu [Fri, 19 May 2017 23:01:20 +0000 (23:01 +0000)]
Merge "Implement stopStreaming API for MBMS" am: e245bf9067 am: a7fffdc0d9 am: efa377cbb6
am: 3ae2ef069e

Change-Id: Iea0f3d4b27a45b8788842b76debef6123b037cd7

7 years agoMerge "Implement stopStreaming API for MBMS" am: e245bf9067 am: a7fffdc0d9
Hall Liu [Fri, 19 May 2017 22:53:42 +0000 (22:53 +0000)]
Merge "Implement stopStreaming API for MBMS" am: e245bf9067 am: a7fffdc0d9
am: efa377cbb6

Change-Id: I1a845cfdeef7bd53beb4fa9b49eebe7a06386622

7 years agoMerge "Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev am: 387b97e68b...
Android Build Merger (Role) [Fri, 19 May 2017 22:52:44 +0000 (22:52 +0000)]
Merge "Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev am: 387b97e68b am: ad13c7abc9"

7 years agoMerge "Add systemui and notification test to framework-base-presubmit suite."
TreeHugger Robot [Fri, 19 May 2017 22:52:40 +0000 (22:52 +0000)]
Merge "Add systemui and notification test to framework-base-presubmit suite."

7 years agoMerge "P2P: update WifiP2pServiceResponse creator" into oc-dev am: 387b97e68b
Glen Kuhne [Fri, 19 May 2017 22:50:59 +0000 (22:50 +0000)]
Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev am: 387b97e68b
am: ad13c7abc9

Change-Id: I9909ddd5cf6c793e004b679ddb7c3d5fc36301a5

7 years agoMerge "Implement stopStreaming API for MBMS" am: e245bf9067
Hall Liu [Fri, 19 May 2017 22:47:06 +0000 (22:47 +0000)]
Merge "Implement stopStreaming API for MBMS" am: e245bf9067
am: a7fffdc0d9

Change-Id: I2c1231a3690067edf90070d7d2a5f3919172caf3

7 years agoMerge "P2P: update WifiP2pServiceResponse creator" into oc-dev
Glen Kuhne [Fri, 19 May 2017 22:41:37 +0000 (22:41 +0000)]
Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev
am: 387b97e68b

Change-Id: I78fb0ac1f49d4a122cfe790fad2d0d7cb5de1589

7 years agoMerge "Implement stopStreaming API for MBMS"
Hall Liu [Fri, 19 May 2017 22:40:22 +0000 (22:40 +0000)]
Merge "Implement stopStreaming API for MBMS"
am: e245bf9067

Change-Id: I4b70f26a5579ddf3af7d426a04aea8ba33312790

7 years agoMerge "P2P: update WifiP2pServiceResponse creator" into oc-dev
Glen Kuhne [Fri, 19 May 2017 22:35:54 +0000 (22:35 +0000)]
Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev

7 years agoMerge "Implement stopStreaming API for MBMS"
Hall Liu [Fri, 19 May 2017 22:32:01 +0000 (22:32 +0000)]
Merge "Implement stopStreaming API for MBMS"

7 years agoChange camera lift sensor to trigger sensor
Jonathan Solnit [Fri, 19 May 2017 22:14:23 +0000 (15:14 -0700)]
Change camera lift sensor to trigger sensor

Camera Lift Trigger sensor is a trigger sensor, fix references and calls in
GestureLauncherService

Bug: 36401147
Test: Did gesture, camera launches
Change-Id: I141e888047517d3aba132ee937919892ba42fa10

7 years agoMerge "Throttle app a11y events in one place."
Phil Weaver [Fri, 19 May 2017 22:12:18 +0000 (22:12 +0000)]
Merge "Throttle app a11y events in one place."

7 years agoMerge "Remove usages of ActionBarActivity."
Aurimas Liutikas [Fri, 19 May 2017 21:26:17 +0000 (21:26 +0000)]
Merge "Remove usages of ActionBarActivity."

7 years agoGradient drawable bounds
Lucas Dupin [Wed, 10 May 2017 23:57:59 +0000 (16:57 -0700)]
Gradient drawable bounds

Checking if setScreenSize was called before drawing or building
paints. This will keep us from making mistakes in the future.

Test: manual
Change-Id: I380f109e3bb3f75b9bc545de012fa857d13af3de

7 years agoMerge "Update PackageSettingBase.usesStaticLibraries correctly." into oc-dev am:...
Sudheer Shanka [Fri, 19 May 2017 21:05:23 +0000 (21:05 +0000)]
Merge "Update PackageSettingBase.usesStaticLibraries correctly." into oc-dev am: f3bb49b02a
am: 9597cec9be

Change-Id: Ia0d0e00e65e311a755c1db4351c15864e4d50ba6

7 years ago[AWARE] Enhance debug logs
Etan Cohen [Fri, 19 May 2017 20:38:25 +0000 (13:38 -0700)]
[AWARE] Enhance debug logs

Add information to the debug message.

Bug: 31940045
Test: unit tests, integration (sl4a) tests
Change-Id: I076825164491a2025a8d04ebb5898a0e742af312

7 years agoMerge "Update PackageSettingBase.usesStaticLibraries correctly." into oc-dev
Sudheer Shanka [Fri, 19 May 2017 20:59:53 +0000 (20:59 +0000)]
Merge "Update PackageSettingBase.usesStaticLibraries correctly." into oc-dev
am: f3bb49b02a

Change-Id: I308ef038e01003e6b035960ff7b5f5ca37c03772

7 years agoAdd systemui and notification test to framework-base-presubmit suite.
Dan Shi [Fri, 19 May 2017 17:52:03 +0000 (10:52 -0700)]
Add systemui and notification test to framework-base-presubmit suite.

Bug: 38433395
Test: suite run
ANDROID_TARGET_OUT_TESTCASES=$ANDROID_TARGET_OUT_TESTCASES \
  tradefed.sh run template/local --template:map \
  test=suite/framework-base-presubmit --log-level-display VERBOSE

Change-Id: Ib9458d72d7dc153ce1bf6da4db7fdadd268542e1

7 years agoMerge "Update PackageSettingBase.usesStaticLibraries correctly." into oc-dev
Sudheer Shanka [Fri, 19 May 2017 20:54:50 +0000 (20:54 +0000)]
Merge "Update PackageSettingBase.usesStaticLibraries correctly." into oc-dev

7 years agoMerge "Missed a break statement. very sorry" into oc-dev am: a2ee78aeb9
Evan Rosky [Fri, 19 May 2017 20:37:21 +0000 (20:37 +0000)]
Merge "Missed a break statement. very sorry" into oc-dev am: a2ee78aeb9
am: f51ae15eeb

Change-Id: I6a1a4db15dbb3aa986506b1c0f70e03bc8eb5830

7 years agoMerge "Missed a break statement. very sorry" into oc-dev
Evan Rosky [Fri, 19 May 2017 20:31:50 +0000 (20:31 +0000)]
Merge "Missed a break statement. very sorry" into oc-dev
am: a2ee78aeb9

Change-Id: I0da645a6bdc05883c137930700a264d7a9aa4400

7 years agoMerge "Missed a break statement. very sorry" into oc-dev
Evan Rosky [Fri, 19 May 2017 20:25:50 +0000 (20:25 +0000)]
Merge "Missed a break statement. very sorry" into oc-dev

7 years agoMerge "Wait for keyguard draw before stopping boot animation" into oc-dev am: ff4cc4ebb5
Keun-young Park [Fri, 19 May 2017 20:22:54 +0000 (20:22 +0000)]
Merge "Wait for keyguard draw before stopping boot animation" into oc-dev am: ff4cc4ebb5
am: 0bdd7ae68e

Change-Id: I53c900ebe66b99fc1596d57e0f43dc32248f8340

7 years agoMerge "Wait for keyguard draw before stopping boot animation" into oc-dev
Keun-young Park [Fri, 19 May 2017 20:14:50 +0000 (20:14 +0000)]
Merge "Wait for keyguard draw before stopping boot animation" into oc-dev
am: ff4cc4ebb5

Change-Id: I1c1437f83387aa4974ee991502018f5b59baf248

7 years agoMerge "Wait for keyguard draw before stopping boot animation" into oc-dev
Keun-young Park [Fri, 19 May 2017 20:07:10 +0000 (20:07 +0000)]
Merge "Wait for keyguard draw before stopping boot animation" into oc-dev

7 years agoMerge "Fix NPE in usage stats manager (recent regression)" into oc-dev am: 091050e92a
Makoto Onuki [Fri, 19 May 2017 19:38:20 +0000 (19:38 +0000)]
Merge "Fix NPE in usage stats manager (recent regression)" into oc-dev am: 091050e92a
am: 75f7c57aef

Change-Id: I98fd109be4e512aabcb0c8f4b030ed7a89a6a906

7 years agoMerge changes I28f7ac47,If075675e into oc-dev am: 4f5c38b357
Winson Chung [Fri, 19 May 2017 19:35:48 +0000 (19:35 +0000)]
Merge changes I28f7ac47,If075675e into oc-dev am: 4f5c38b357
am: 97fb03ca2f

Change-Id: I7fb14effb541dc5329e25a1fd026ad1372346f98

7 years agoMerge "Fix NPE in usage stats manager (recent regression)" into oc-dev
Makoto Onuki [Fri, 19 May 2017 19:30:33 +0000 (19:30 +0000)]
Merge "Fix NPE in usage stats manager (recent regression)" into oc-dev
am: 091050e92a

Change-Id: I5da7220aa9f5ff0db999c00881577b160e6b17ba

7 years agoMerge changes I28f7ac47,If075675e into oc-dev
Winson Chung [Fri, 19 May 2017 19:28:15 +0000 (19:28 +0000)]
Merge changes I28f7ac47,If075675e into oc-dev
am: 4f5c38b357

Change-Id: I21d7ad41247bf36fdc7209dbe6f2b26a86cdd26b

7 years agoMerge "Fix NPE in usage stats manager (recent regression)" into oc-dev
Makoto Onuki [Fri, 19 May 2017 19:24:21 +0000 (19:24 +0000)]
Merge "Fix NPE in usage stats manager (recent regression)" into oc-dev

7 years agoMerge changes I28f7ac47,If075675e into oc-dev
Winson Chung [Fri, 19 May 2017 19:18:50 +0000 (19:18 +0000)]
Merge changes I28f7ac47,If075675e into oc-dev

* changes:
  Fixing regression in Recents preloading.
  Adding cached value for current user for per-SysUI process components.

7 years agoMerge "Protect against DeviceProvisionedListeners mutating mListeners."
Philip Quinn [Fri, 19 May 2017 19:02:22 +0000 (19:02 +0000)]
Merge "Protect against DeviceProvisionedListeners mutating mListeners."

7 years agoMerge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into...
Michael Wachenschwanz [Fri, 19 May 2017 18:56:25 +0000 (18:56 +0000)]
Merge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into oc-dev am: 61e2b15866
am: d6066c83ca

Change-Id: I9877b678a244e0149ba6bb6aa4a8185113571374

7 years agoMerge "Cumulative wakelock time per uid" into oc-dev am: 1effe000b8
Adam Bookatz [Fri, 19 May 2017 18:41:45 +0000 (18:41 +0000)]
Merge "Cumulative wakelock time per uid" into oc-dev am: 1effe000b8
am: 95cf947fba

Change-Id: I58660c0671a49388f8b9fdff28060e9312fa497d

7 years agoMerge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into...
Michael Wachenschwanz [Fri, 19 May 2017 18:40:47 +0000 (18:40 +0000)]
Merge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into oc-dev
am: 61e2b15866

Change-Id: I6dc739ac35e8965b3a6ed84fe03d20c0441193c5

7 years agoMerge "Cumulative wakelock time per uid" into oc-dev
Adam Bookatz [Fri, 19 May 2017 18:32:20 +0000 (18:32 +0000)]
Merge "Cumulative wakelock time per uid" into oc-dev
am: 1effe000b8

Change-Id: I475ced78c13cadd48ba3be70d680a4a3fa83e500

7 years agoMerge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into...
Michael Wachenschwanz [Fri, 19 May 2017 18:27:10 +0000 (18:27 +0000)]
Merge "DO NOT MERGE Revert "WTF Logging for catching memory issue in Parcel"" into oc-dev

7 years agoMerge "Cumulative wakelock time per uid" into oc-dev
Adam Bookatz [Fri, 19 May 2017 18:24:31 +0000 (18:24 +0000)]
Merge "Cumulative wakelock time per uid" into oc-dev

7 years agoMerge "CommonTimeManagementService: fix error-prone warnings."
Andrew Scull [Fri, 19 May 2017 18:10:28 +0000 (18:10 +0000)]
Merge "CommonTimeManagementService: fix error-prone warnings."

7 years agoMerge "Fix "launcher starting on work profile"" into oc-dev am: b6d1a19819
Makoto Onuki [Fri, 19 May 2017 18:01:08 +0000 (18:01 +0000)]
Merge "Fix "launcher starting on work profile"" into oc-dev am: b6d1a19819
am: b5c6c3daa7

Change-Id: I228d7efd8c283882bb2d431b87ae73da01000156

7 years agoConvert Shader to NativeAllocationRegistry
John Reck [Fri, 19 May 2017 17:55:20 +0000 (10:55 -0700)]
Convert Shader to NativeAllocationRegistry

Bug: 38258699
Test: manual
Change-Id: I1537dee3187ea0366f2c236f3e6825196d738a37

7 years agoMerge "Fix "launcher starting on work profile"" into oc-dev
Makoto Onuki [Fri, 19 May 2017 17:54:07 +0000 (17:54 +0000)]
Merge "Fix "launcher starting on work profile"" into oc-dev
am: b6d1a19819

Change-Id: Id1e6bdc951b0c139406195af378ccdfa21730d12

7 years agoMerge "Make multi presses on power button timeout configurable through overlay."
Alain Vongsouvanh [Fri, 19 May 2017 17:47:39 +0000 (17:47 +0000)]
Merge "Make multi presses on power button timeout configurable through overlay."

7 years agoMerge "Fix "launcher starting on work profile"" into oc-dev
Makoto Onuki [Fri, 19 May 2017 17:43:54 +0000 (17:43 +0000)]
Merge "Fix "launcher starting on work profile"" into oc-dev

7 years agoMerge "WifiMetrics: Add metrics for HAL/wificond crashes"
Roshan Pius [Fri, 19 May 2017 17:39:18 +0000 (17:39 +0000)]
Merge "WifiMetrics: Add metrics for HAL/wificond crashes"

7 years agoFix NPE in usage stats manager (recent regression)
Makoto Onuki [Fri, 19 May 2017 17:31:52 +0000 (10:31 -0700)]
Fix NPE in usage stats manager (recent regression)

Change-Id: I305bb64b11c9240dc0df5d7b08a9a970660157c8
Fix: 38430177
Test: build and boot

7 years agoMerge "Also pin vdex file for camera" into oc-dev am: 540c5bd354
Calin Juravle [Fri, 19 May 2017 17:14:33 +0000 (17:14 +0000)]
Merge "Also pin vdex file for camera" into oc-dev am: 540c5bd354
am: 38d73cfa1f

Change-Id: Ib7f9bfd72396c4273abd1b1ba26e1471f5de45b3

7 years agoMerge "Also pin vdex file for camera" into oc-dev
Calin Juravle [Fri, 19 May 2017 17:04:55 +0000 (17:04 +0000)]
Merge "Also pin vdex file for camera" into oc-dev
am: 540c5bd354

Change-Id: I4c78a055bdba42b0dc6050e0b06d606b65ec380d

7 years agoMerge "Also pin vdex file for camera" into oc-dev
Calin Juravle [Fri, 19 May 2017 16:56:37 +0000 (16:56 +0000)]
Merge "Also pin vdex file for camera" into oc-dev

7 years agoWifiManager: get startLOHS packageName
Rebecca Silberstein [Thu, 18 May 2017 08:27:57 +0000 (01:27 -0700)]
WifiManager: get startLOHS packageName

When an application calls startLocalOnlyHotspot, we need to send the
package name from the manager-side of the call.  This CL updates the
call to WifiServiceImpl.startLocalOnlyHotspot and the relevant aidl
file.

Bug: 31466854
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I1dd0142dc58c767336c9323986d20e38bf11220d

7 years agoWait for keyguard draw before stopping boot animation
Keun-young Park [Mon, 8 May 2017 21:51:59 +0000 (14:51 -0700)]
Wait for keyguard draw before stopping boot animation

- Add check for keyguard drawn before stopping boot animation.
  Otherwise blank screen can happen.
- Bind to keyguard service when sysui is launched to reduce waiting
  time later.
- Increase keyguard timeout to 5 secs if it is not boot completed.
  Otherwise (= normal screen on), keep the current 1 sec.
  This timeout can still lead into blank screen so use bigger timeout
  during boot-up to prevent such case.

bug: 37867510
Test: many reboots

Change-Id: Ibfdc42d295bb1d3f5b4ea316fe5aca9ab875e4be

7 years agoMerge "LegacyGlobalActions.java: add missing @Override annotations"
Andrew Scull [Fri, 19 May 2017 16:11:06 +0000 (16:11 +0000)]
Merge "LegacyGlobalActions.java: add missing @Override annotations"

7 years agoMerge "Fix underdraw during resizing" into oc-dev am: 906fe92759
Jorim Jaggi [Fri, 19 May 2017 16:04:17 +0000 (16:04 +0000)]
Merge "Fix underdraw during resizing" into oc-dev am: 906fe92759
am: c907b736a9

Change-Id: Iae0cfdbe8dfe79142c55d282069d9740f83f1b3f

7 years agoMake multi presses on power button timeout configurable through overlay.
Alain Vongsouvanh [Tue, 11 Apr 2017 00:13:17 +0000 (17:13 -0700)]
Make multi presses on power button timeout configurable through overlay.

Previous implementation used the same timeout value as screen double tap which
does not take into account device specific hardware differences.
New implementation uses the existing ViewConfiguration#getMultiPressTimeout()
value which is configurable through a Setting item and default overlay.

Bug: 37671926
Test: Cherry-picked back to cw-f-dev, flashed on Sculpin with no
      configuration changed and verified that timeout was still at
      300ms. Added an overlay to increase the timeout, flashed on
      Sculpin and verified that the new timeout was being used.

Change-Id: Ie0ab705cafb2a3be9a31e66a03a3c9c656196ca1

7 years agoMerge "Round the corners of the battery icon"
Evan Laird [Fri, 19 May 2017 16:00:10 +0000 (16:00 +0000)]
Merge "Round the corners of the battery icon"

7 years agoMerge "Fix underdraw during resizing" into oc-dev
Jorim Jaggi [Fri, 19 May 2017 15:53:18 +0000 (15:53 +0000)]
Merge "Fix underdraw during resizing" into oc-dev
am: 906fe92759

Change-Id: I25fe2b06324f238d2d5d6092837919d1f5659bf3

7 years agoMerge "Fix underdraw during resizing" into oc-dev
Jorim Jaggi [Fri, 19 May 2017 15:42:46 +0000 (15:42 +0000)]
Merge "Fix underdraw during resizing" into oc-dev

7 years agoMerge "Resolve error-prone warnings."
Andrew Scull [Fri, 19 May 2017 14:51:21 +0000 (14:51 +0000)]
Merge "Resolve error-prone warnings."

7 years agoLegacyGlobalActions.java: add missing @Override annotations
Andrew Scull [Fri, 19 May 2017 14:26:30 +0000 (15:26 +0100)]
LegacyGlobalActions.java: add missing @Override annotations

error-prone was raising warnings for these.

Change-Id: I65f98e4ff6385bcf5d63d4c9beec021bfe80f3f2
Fix: 38445791
Test: Build

7 years agoMerge "wm/Server.java: add missing @Override annotations"
Andrew Scull [Fri, 19 May 2017 13:12:46 +0000 (13:12 +0000)]
Merge "wm/Server.java: add missing @Override annotations"

7 years agoMerge "WebViewUpdater: make lock object final."
Andrew Scull [Fri, 19 May 2017 13:06:35 +0000 (13:06 +0000)]
Merge "WebViewUpdater: make lock object final."

7 years agoFix underdraw during resizing
Jorim Jaggi [Fri, 19 May 2017 12:53:55 +0000 (14:53 +0200)]
Fix underdraw during resizing

Since we hide the navigation bar background during resizing, we
need to fill it with the fallback background.

This was always an issue but somehow in OC we are displaying
garbage instead of black.

Test: Open Contacts/Dialer, resize, make sure no underdraw is
happening. Also test a couple of other apps.
Fixes: 36206155

Change-Id: I6b02060ef4acf36c2529d49063a61034f9261696

7 years agoMerge "Take snapshot when screen is turning off" into oc-dev am: 64900ad13c
Jorim Jaggi [Fri, 19 May 2017 12:50:06 +0000 (12:50 +0000)]
Merge "Take snapshot when screen is turning off" into oc-dev am: 64900ad13c
am: 8947e7a215

Change-Id: Ifec8c2e6368e01e47ae2fdf6fecded4a7aa9172e

7 years agoMerge "Take snapshot when screen is turning off" into oc-dev
Jorim Jaggi [Fri, 19 May 2017 12:41:03 +0000 (12:41 +0000)]
Merge "Take snapshot when screen is turning off" into oc-dev
am: 64900ad13c

Change-Id: If64b205fc27f33a4359f00fe7f551b9797b1380f