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

306398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
49e57a2d9f Merge "API for app to know what to set in Activity.setVolumeControlStream()" 2017-02-06 18:54:35 +00:00
TreeHugger Robot
ad2409a26c Merge "Add Vulkan compute level system feature" 2017-02-06 18:47:38 +00:00
TreeHugger Robot
b0a820fbf0 Merge "Set RetailDemoModeService#mDeviceInDemoMode to false" 2017-02-06 18:43:05 +00:00
TreeHugger Robot
96c44c48ac Merge "Schedule strong auth timeout in handler to avoid deadlock." 2017-02-06 18:32:28 +00:00
Selim Cinek
391b1b82d2 Merge "Further improved the coloring optimization" 2017-02-06 18:20:37 +00:00
Bryce Lee
3460fefd4d Merge "Limit getRunningServices to calling uid's services." 2017-02-06 18:15:26 +00:00
Android Build Merger (Role)
489a1d5f57 Merge "Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b am: 57f2ed0757" into nyc-mr2-dev-plus-aosp am: 3039b49111" 2017-02-06 18:03:59 +00:00
Android Build Merger (Role)
a94d3356a6 Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b am: 57f2ed0757 am: 0b8080dfda" 2017-02-06 18:03:36 +00:00
Pavel Grafov
bb5afd26eb Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b am: 57f2ed0757" into nyc-mr2-dev-plus-aosp 
am: 3039b49111

Change-Id: Ia8f7e712ab320f8e1d910719475b8e3ea40e4f8c
 2017-02-06 18:02:33 +00:00
Pavel Grafov
3438cd91d6 Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b am: 57f2ed0757 
am: 0b8080dfda

Change-Id: I6f42a0746d819565960bda6ddefdbc036bd93aec
 2017-02-06 18:02:23 +00:00
Android Build Merger (Role)
182e7c5e14 Merge "Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b am: 43c6f28891" into nyc-mr2-dev-plus-aosp am: 573f0587f7" 2017-02-06 18:01:49 +00:00
Android Build Merger (Role)
3e335f67ec Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b am: 43c6f28891 am: 637d54acf5" 2017-02-06 18:01:25 +00:00
Pavel Grafov
c351d5e4f7 Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b am: 43c6f28891" into nyc-mr2-dev-plus-aosp 
am: 573f0587f7

Change-Id: Ib80bacc1b829af19bb187bb8a6d77d0093362d79
 2017-02-06 18:00:34 +00:00
Pavel Grafov
2de4257e3c Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b am: 43c6f28891 
am: 637d54acf5

Change-Id: I2f40fe3b1f566bef69321fb8e645f33a30702496
 2017-02-06 18:00:26 +00:00
Android Build Merger (Role)
8e166e09e4 Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74 am: 1bb00e0849" into nyc-mr2-dev-plus-aosp am: 32e51130ad" 2017-02-06 17:59:57 +00:00
Android Build Merger (Role)
548b715b79 Merge "Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74 am: 1bb00e0849 am: a9b4a62827" 2017-02-06 17:59:35 +00:00
Pavel Grafov
e7f7129cd0 Merge "Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74 am: 1bb00e0849" into nyc-mr2-dev-plus-aosp 
am: 32e51130ad

Change-Id: If896a412da7afc5ea983d88e2c95cadf35eb2dd1
 2017-02-06 17:58:41 +00:00
Pavel Grafov
06e223f926 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74 am: 1bb00e0849 
am: a9b4a62827

Change-Id: I42f0e81b1224ae16ac6494a3b9345eab00c76ca3
 2017-02-06 17:58:33 +00:00
Android Build Merger (Role)
22b468b0df Merge "Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74 am: 5a474b4930 am: c3beac34f6" 2017-02-06 17:57:59 +00:00
TreeHugger Robot
0e51ca472e Merge "MediaSession: Add methods for queue managements" 2017-02-06 17:57:42 +00:00
Pavel Grafov
9b8beea020 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74 am: 5a474b4930 
am: c3beac34f6

Change-Id: Ia45f8bea58e15e33e41cf25b09b5220870d9dd07
 2017-02-06 17:57:15 +00:00
Android Build Merger (Role)
3039b49111 Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b am: 57f2ed0757" into nyc-mr2-dev-plus-aosp 2017-02-06 17:55:08 +00:00
Android Build Merger (Role)
573f0587f7 Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b am: 43c6f28891" into nyc-mr2-dev-plus-aosp 2017-02-06 17:54:28 +00:00
Pavel Grafov
0b8080dfda Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b 
am: 57f2ed0757

Change-Id: I0e4c4509da48a7ab4cd3e66e942a55c81d489613
 2017-02-06 17:53:56 +00:00
Pavel Grafov
637d54acf5 Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a am: 1f8f29968b 
am: 43c6f28891

Change-Id: I862bf8bfb188bb2951d5c01254239d42ef92e1c2
 2017-02-06 17:53:42 +00:00
Android Build Merger (Role)
32e51130ad Merge "Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74 am: 1bb00e0849" into nyc-mr2-dev-plus-aosp 2017-02-06 17:53:33 +00:00
Pavel Grafov
a9b4a62827 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74 
am: 1bb00e0849

Change-Id: Ice787dfa05849e8a2b77575969334c33509cacb7
 2017-02-06 17:52:43 +00:00
Pavel Grafov
c3beac34f6 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 am: fca679ff74 
am: 5a474b4930

Change-Id: If1731db386157b1f53c3a7bbe379299c1ada0ca9
 2017-02-06 17:52:37 +00:00
Pavel Grafov
43c6f28891 Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a 
am: 1f8f29968b

Change-Id: Id0a5c05b902f6c47c32dbef4d84cbe527a8803b9
 2017-02-06 17:47:17 +00:00
Pavel Grafov
57f2ed0757 Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a 
am: 1f8f29968b

Change-Id: Ib43072f8a6d35c4e297493f49386aafed53a609a
 2017-02-06 17:47:10 +00:00
Pavel Grafov
5a474b4930 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 
am: fca679ff74

Change-Id: Ic6e2aab590583c501fa74317ee614ab1ebaea378
 2017-02-06 17:46:11 +00:00
Pavel Grafov
1bb00e0849 Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31 
am: fca679ff74

Change-Id: I9f02c30450e56b8f25bbbe4b1baa2381c84437c8
 2017-02-06 17:46:09 +00:00
Pavel Grafov
1f8f29968b Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev 
am: 504ca8e41a

Change-Id: I9f880a65827d689aa379ff54138f54422048a59c
 2017-02-06 17:41:12 +00:00
Pavel Grafov
fca679ff74 Fix the documentation for SecurityLog.SecurityEvent.getData(). 
am: 739cda8f31

Change-Id: I0c6f1271392bfc9cc8d253d5fa5e029213492b48
 2017-02-06 17:41:08 +00:00
TreeHugger Robot
40eb0ba427 Merge "Revert "Implicitly cast views obtained via View.findView methods"" 2017-02-06 17:37:49 +00:00
Pavel Grafov
504ca8e41a Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev 2017-02-06 17:35:09 +00:00
Jesse Hall
1cd7e93195 Add Vulkan compute level system feature 
The names of specific Vulkan API features can't be documented yet,
because they won't be ratified by Khronos before the documentation
becomes public in a developer preview.

Bug: 34745152
Test: android.graphics.cts.VulkanFeaturesTest
Change-Id: I9af673bcb5b0c74bde72ab7a579573894170a55d
 2017-02-06 08:57:42 -08:00
TreeHugger Robot
3d6f51d18b Merge "Additional badging APIs." 2017-02-06 16:49:35 +00:00
Justin Klaassen
c07ec63c94 Set RetailDemoModeService#mDeviceInDemoMode to false 
Reset mDeviceInDemoMode when the device exits demo mode. This isn't a
supported configuration in the production devices, but it's used for CTS
in order to run tests back-to-back without reprovisioning the device.

Fixes: 34938521
Test: RetailDemoModeServiceTest
Change-Id: I5a7134815b2817e7b02b1a2df71932faee967e8d
 2017-02-06 08:42:25 -08:00
Greg Daniel
bccd58cde3 Merge "Have Skia Vulkan backend support wait-for-gpu flag on tests" 2017-02-06 16:21:59 +00:00
Narayan Kamath
268736e782 Merge "PackageManagerService: Log time spent on cpppreopt." 2017-02-06 16:06:05 +00:00
Jason Monk
792e43cbe8 Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e am: 74a8b6543f am: a8e10e5f20 
am: 6e8c039e24

Change-Id: If9ed9697cc042375abd3d77b1eb4020d2798f96c
 2017-02-06 15:56:38 +00:00
Andrew Scull
b15b1b4bd8 Schedule strong auth timeout in handler to avoid deadlock. 
Bug: 34962180
Test: manual -- create profile, set separate password, remove separate
password and observe not deadlock i.e. screen doesn't freeze up.

Change-Id: I83b554ddeb22866d129de44775869d385e63fb3e
 2017-02-06 15:53:39 +00:00
Jason Monk
6e8c039e24 Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e am: 74a8b6543f 
am: a8e10e5f20

Change-Id: I1585be50ecf4409f552b5ef5c91de1092a01e199
 2017-02-06 15:52:04 +00:00
Jason Monk
a8e10e5f20 Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e 
am: 74a8b6543f

Change-Id: If195ccf536a45ef21e8ee70547ea76e26732c583
 2017-02-06 15:47:39 +00:00
Jason Monk
74a8b6543f Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" 
am: ff1d8da55e

Change-Id: I173b94730ae02f3e9b0638aac9f43972b59e10f3
 2017-02-06 15:43:04 +00:00
Bryce Lee
290e57886d Limit getRunningServices to calling uid's services. 
Previously all running services for the user were returned when calling
ActivityManager#getRunningServices. This changelist enforces restrictions
similar to getRunningTasks, where only the user services with a matching
uid will be returned.

Fixes: 34274345
Test: manual with sample app
Test: make -j32 cts; cts-tradefed; run cts --module CtsAppTestCases
      --test android.app.cts.ServiceTest#testRunningServices
Change-Id: I2a13328424d3741fec6076f45ba638bb754d19c5
 2017-02-06 07:42:16 -08:00
Jason Monk
ff1d8da55e Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" 2017-02-06 15:34:38 +00:00
Narayan Kamath
11bbd9e27c Merge "MethodHandles: Expose additional API." am: 869141fef7 am: a93d04a765 am: f29140955f 
am: a866751b9f

Change-Id: I95d0ac752a02a7213b5e284e8a51180167639e0b
 2017-02-06 14:29:43 +00:00
Narayan Kamath
a866751b9f Merge "MethodHandles: Expose additional API." am: 869141fef7 am: a93d04a765 
am: f29140955f

Change-Id: I3e909e1a4faf70fcc9a58fc7bcd6c25abc87d901
 2017-02-06 14:25:35 +00:00