drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
310,886 Commits 1 Branch 0 Tags
Commit Graph

310886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Reed
871cd2dd60 use SkVertices::Builder in drawBitmapLattice 
override new virtual onDrawVerticesObject

Test:  CtsGraphicsTestCases

Change-Id: I38e3ee0aa2a1ee9c11474c2c5d648ee5fca20d78
 2017-03-20 08:40:12 -04:00
Conrad Chen
96f6a1a7d6 Merge "Block modifying types of channels" 2017-03-17 19:39:44 +00:00
TreeHugger Robot
741a898514 Merge "Adding an extras Bundle to MessagingStyle messages." 2017-03-17 19:38:02 +00:00
TreeHugger Robot
13a8b79755 Merge "Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays" 2017-03-17 19:19:45 +00:00
Diego Perez
37ecda0eba Merge "Fix BitmapShader to work with adaptive icons" 2017-03-17 18:01:30 +00:00
TreeHugger Robot
9f7958c17f Merge "Disable large-ish parcel logging." 2017-03-17 17:57:30 +00:00
TreeHugger Robot
2fb89f45b9 Merge "Removed 'virtual' from autofill method names." 2017-03-17 17:54:37 +00:00
TreeHugger Robot
6e4075bde6 Merge "Adding enabled state for remote actions." 2017-03-17 17:51:45 +00:00
Roshan Pius
b2312cdbb6 Merge "WifiConfiguration: Correct documentation for priority" am: f5fa26bf25 am: da34226f06 
am: 9205ccf3ee

Change-Id: I33a6f328a4373c323bfe1b2de59273faf5c03695
 2017-03-17 17:40:54 +00:00
Roshan Pius
f817fbce16 Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632 am: 6b6f1b9e12 
am: 28212c1b29

Change-Id: I478ebcd9f2d98e35a3ae408d027b67d69de79c09
 2017-03-17 17:39:37 +00:00
Roshan Pius
9205ccf3ee Merge "WifiConfiguration: Correct documentation for priority" am: f5fa26bf25 
am: da34226f06

Change-Id: I4b01b13b9628a06040db3a49c2e7769b837cadf6
 2017-03-17 17:34:10 +00:00
Roshan Pius
28212c1b29 Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632 
am: 6b6f1b9e12

Change-Id: I38ef25c794573c2a0c2817ca4e8cd1a8c2aa9250
 2017-03-17 17:33:06 +00:00
Andrii Kulian
e6ac20e1c7 Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays 
MANAGE_ACTIVITY_STACKS permission allows moving stacks, tasks and
activities between corresponding parents. It makes no sense to
require more strict START_ANY_ACTIVITY permission to launch on
private display, as an activity still can be moved to it.

Bug: 34164473
Test: 'adb unroot' and run android.server.cts.ActivityManagerDisplayTests
Change-Id: I3b59127829c432e42a46630025eeddd152bce1b0
 2017-03-17 10:30:50 -07:00
Roshan Pius
da34226f06 Merge "WifiConfiguration: Correct documentation for priority" 
am: f5fa26bf25

Change-Id: I37fd50fac3dc6c2db8c677d1a265fca73babf5da
 2017-03-17 17:28:13 +00:00
Roshan Pius
6b6f1b9e12 Merge "WifiConfiguration: Update psk documentation" 
am: 89c79ff632

Change-Id: I3ac1ed89de58038cf7bcddcac7b090fc07a8e4b8
 2017-03-17 17:26:57 +00:00
TreeHugger Robot
1c10a61a97 Merge "Allow Instant Apps access PackageInfo of exposed apps" 2017-03-17 17:26:24 +00:00
Treehugger Robot
f5fa26bf25 Merge "WifiConfiguration: Correct documentation for priority" 2017-03-17 17:18:32 +00:00
Treehugger Robot
89c79ff632 Merge "WifiConfiguration: Update psk documentation" 2017-03-17 17:17:50 +00:00
Tomasz Wasilczyk
3d19f90c32 Merge "Add getProgramList call to the broadcast radio API." 2017-03-17 16:34:55 +00:00
Jerome Gaillard
3ce947f482 Merge "Update ColorFilter_Delegate following Change I5f74addd" 2017-03-17 16:29:36 +00:00
Jeff Sharkey
f5299f1b88 Disable large-ish parcel logging. 
This logging was originally added to track down very large log
messages that were causing Binder transactions to fail.  We fixed
a handful of bugs that could have been causing this over in 32575987,
so this logging should no longer be needed in live builds.  (In fact,
this logging is being triggered often enough to push other important
debugging information out of logs.)

Test: builds, boots
Bug: 36372780
Change-Id: I640192fbec35693673a2f22b7a82ce54f27937da
 2017-03-17 10:25:10 -06:00
TreeHugger Robot
837c927213 Merge "Fix up QS edit UI" 2017-03-17 16:11:36 +00:00
Felipe Leme
81f01d9efd Removed 'virtual' from autofill method names. 
Fixes: 36126001
Test: VirtualContainerActivityTest pass

Change-Id: I3b8fe835cd7c7f39c8e2cb8f2daca71b03236a1f
 2017-03-17 09:09:31 -07:00
Neil Fuller
ff8b79e162 Merge "Track library change in libcore." am: ed9c176e16 am: 301f1d3645 
am: cef08e7482  -s ours

Change-Id: Ide1ba5f3864e13376e15c561a911d5e2394328fa
 2017-03-17 15:50:31 +00:00
Roshan Pius
651b264b3d WifiConfiguration: Correct documentation for priority 
Addressing the concerns raised by API council for deprecating this
field.

Bug: 35854198
Test: make update-api
Change-Id: If9ca582f5d3bd8539a226b425662832241a447cc
 2017-03-17 08:44:06 -07:00
Neil Fuller
cef08e7482 Merge "Track library change in libcore." am: ed9c176e16 
am: 301f1d3645

Change-Id: Ifb24866783cab6a602ac5f3dd1df705ba93d931e
 2017-03-17 15:44:05 +00:00
Roshan Pius
cbd0c76ad0 WifiConfiguration: Update psk documentation 
Adding some documentation to explain the expected contents of this
field.

Bug: 35967623
Test: make update-api
Change-Id: Ia28e2c79834c4d7b0de7350c18d5f32633e6309d
 2017-03-17 08:40:17 -07:00
Andrii Kulian
c1b59ed73e Merge "Separate global and override config sent to client" 2017-03-17 15:39:37 +00:00
Neil Fuller
301f1d3645 Merge "Track library change in libcore." 
am: ed9c176e16

Change-Id: Iae6166cf055625947589b3a14b72ed7828738311
 2017-03-17 15:38:01 +00:00
TreeHugger Robot
edd694e4bf Merge "Change dependency to standard mockito-target-minus-junit4" 2017-03-17 15:32:07 +00:00
Treehugger Robot
ed9c176e16 Merge "Track library change in libcore." 2017-03-17 15:28:35 +00:00
TreeHugger Robot
a83ebca651 Merge "Protect against hiding while not attached" 2017-03-17 15:27:49 +00:00
Diego Perez
f4291b03cc Fix BitmapShader to work with adaptive icons 
Test: Existing test should pass
Change-Id: Ie4c78eab4dfacf1eb6060d71edb98b836c4eff78
 2017-03-17 15:09:00 +00:00
liangweikang
5a2c5a3bd9 Merge "[BUG] fix NullPointerException in Notification.java" am: c14d5db093 am: 79e9f380e2 
am: 9b0784aa5f

Change-Id: I41f9d2d027138360d3a967c97dbf3aed69512650
 2017-03-17 15:07:50 +00:00
liangweikang
9b0784aa5f Merge "[BUG] fix NullPointerException in Notification.java" am: c14d5db093 
am: 79e9f380e2

Change-Id: Ic9356edc395f68c5dda5a19a2efca31b5f16a068
 2017-03-17 14:57:55 +00:00
liangweikang
79e9f380e2 Merge "[BUG] fix NullPointerException in Notification.java" 
am: c14d5db093

Change-Id: Ib1c17e2fe5f36e0230845ca123b0cd2cb7365154
 2017-03-17 14:51:58 +00:00
TreeHugger Robot
1d33b07f44 Merge "Removing 'delegate' from constant names" 2017-03-17 14:48:15 +00:00
Treehugger Robot
c14d5db093 Merge "[BUG] fix NullPointerException in Notification.java" 2017-03-17 14:43:20 +00:00
Jason Monk
6f77056666 Fix up QS edit UI 
Turns out QS Edit mode didn't like the changes to dual target tiles.
Clean this up a bit.

Test: visual
Change-Id: I158fe8dba6729de102cfc592314ec483a969417d
 2017-03-17 10:15:15 -04:00
Paul Duffin
a7773c2fb1 Change dependency to standard mockito-target-minus-junit4 
The mockito-updated-target-minus-junit4 target was added because
some tests needed a later version of mockito than was available
through mockito-target-minus-junit4. Since the latter has now
been upgraded to 2.7.13 that is no longer true and so users of
mockito-updated-target-minus-junit4 can be switched to use
mockito-target-minus-junit4 instead.

Bug: 32912773
Test: make checkbuild && runtest systemui
Change-Id: If7e4dd26d7d0e93731856e9739a048c89a835333
 2017-03-17 13:52:15 +00:00
Jason Monk
581084123f Protect against hiding while not attached 
Change-Id: I44b16d2644c80c737ffc16bf11cc1259e3c3984b
Fixes: 36137783
Test: Edit QS
 2017-03-17 09:47:30 -04:00
Julia Reynolds
f619bc5211 Removing 'delegate' from constant names 
Change-Id: I2ac4e3ae08f1084da34ea74fdd5177e2d58987af
Fixes: 35812334
Test: build
 2017-03-17 08:43:22 -04:00
Jerome Gaillard
5aa62827ca Update ColorFilter_Delegate following Change I5f74addd 
Test: layoutlib tests
Change-Id: Ifb18946edb0c40e0120868e211c99a304801e740
 2017-03-17 12:15:36 +00:00
Neil Fuller
01a3ff1238 Track library change in libcore. 
Adding a required dependency on new shared library for tzdata code.

Bug: 31008728
Test: make
Merged-In: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
Change-Id: I40b725a97ae2bc258b1fd4b2312b6c60ff83fe64
 2017-03-17 11:57:59 +00:00
Neil Fuller
9408983ba7 Track library change in libcore. 
Adding a required dependency on new shared library for tzdata code.

Bug: 31008728
Test: make
Change-Id: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
 2017-03-17 11:53:05 +00:00
Narayan Kamath
089efe43cf Merge "fd_utils: address a couple of TODOs." am: eae1ae9732 am: a34d01d1ee 
am: 8497b653f6

Change-Id: Ic8735187a22df886f07da887f12dddff248d1028
 2017-03-17 10:05:14 +00:00
Narayan Kamath
8497b653f6 Merge "fd_utils: address a couple of TODOs." am: eae1ae9732 
am: a34d01d1ee

Change-Id: I167e56d78a5a1ef6c2f1bcad891d5f20f4e07375
 2017-03-17 09:58:12 +00:00
Narayan Kamath
a34d01d1ee Merge "fd_utils: address a couple of TODOs." 
am: eae1ae9732

Change-Id: I8e4e92df3c1f0016de2c396345b7a0b4bc0e1cb6
 2017-03-17 09:51:35 +00:00
Narayan Kamath
eae1ae9732 Merge "fd_utils: address a couple of TODOs." 2017-03-17 09:44:12 +00:00
Narayan Kamath
3879ecc891 fd_utils: address a couple of TODOs. 
Drink the android::base koolaid.

Test: make, boots
Change-Id: Ib24b9b59fa3490e80ba78be0199eafa676225b73
 2017-03-17 09:43:53 +00:00