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

315517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
170e3e242b Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev 2017-04-12 15:45:58 +00:00
Mady Mellor
2a7305ac8c Merge "Show x for short period of time when activity is PIP'd" into oc-dev am: 56069d7146 
am: f0caa83702

Change-Id: I90144f8bf5d7d030aed106116b2e231a62c29bd5
 2017-04-12 15:43:26 +00:00
Winson Chung
e3c21e0015 Fix regression when removing task. 
- Limit removing the task immediately to when there is a single task
  overlay activity. Certain activities may not work when force-removed
  before the clean up work in removeTask() completes especially if the
  finishing activity is a part of a launch process (ie. trampoline
  activity). This behaviour is only needed for finishing activities that
  have actual task overlays.

Bug: 36761629
Test: Launch SiriusXM, and check that it loads
Change-Id: I34c812ab111819e858fe36b6359f82da717ba459
 2017-04-12 08:41:39 -07:00
Mady Mellor
f0caa83702 Merge "Show x for short period of time when activity is PIP'd" into oc-dev 
am: 56069d7146

Change-Id: I9c3263bd91e377b4342ab8184444e5230eeab511
 2017-04-12 15:38:04 +00:00
Paul Mclean
72bd4e2c52 Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev am: e0e55f535a 
am: ffec10fcd5

Change-Id: Ie914337e190ba49d7ce4f0b3a3e485a14a4dd3d2
 2017-04-12 15:37:54 +00:00
Robert Greenwalt
7c1460f388 Merge "Adding 20 free short codes for DCB and other purposes" am: 70fea2df2a 
am: 03f9a489cb

Change-Id: Ic4915213105ba31c63d97187297c652a477e99df
 2017-04-12 15:37:53 +00:00
Mady Mellor
56069d7146 Merge "Show x for short period of time when activity is PIP'd" into oc-dev 2017-04-12 15:32:31 +00:00
Robert Greenwalt
03f9a489cb Merge "Adding 20 free short codes for DCB and other purposes" 
am: 70fea2df2a

Change-Id: Ic63e088d49796b6e98dc92bc3b0b261958d73e8c
 2017-04-12 15:27:23 +00:00
Paul Mclean
ffec10fcd5 Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev 
am: e0e55f535a

Change-Id: I8fb4d8f1a1d237aa28780f6f419b9a8fd6131a06
 2017-04-12 15:27:20 +00:00
Paul Mclean
e0e55f535a Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev 2017-04-12 15:16:22 +00:00
Robert Greenwalt
70fea2df2a Merge "Adding 20 free short codes for DCB and other purposes" 2017-04-12 15:15:34 +00:00
Mark Salyzyn
8605bd6096 Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev am: b4b44d3bae 
am: 27a8061a96

Change-Id: I21f457a5f1710b226a01c8d0c98116304ae85d17
 2017-04-12 15:05:48 +00:00
Tomasz Wasilczyk
5fccceb2c5 Merge "Initial implementation of Java-based broadcast radio service." 2017-04-12 14:58:41 +00:00
Mark Salyzyn
27a8061a96 Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev 
am: b4b44d3bae

Change-Id: Ia548ce29efe31da1fc207cc32ca887468245b88c
 2017-04-12 14:55:26 +00:00
Mark Salyzyn
b4b44d3bae Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev 2017-04-12 14:49:17 +00:00
Michael Wright
7783872441 Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev am: 7ecd40c1fc 
am: 719d1f06fb

Change-Id: Ib6c86d95d893d306de897ce31b07456fc17a124f
 2017-04-12 14:28:27 +00:00
Seigo Nonaka
43c20cf6d4 Introduce FILE_ID for TTC fonts and variation fonts. 
A single TTC font or variation font can be used for multiple entry
of FontResult. To share the file contents, assign same URI for those.

Bug: 36494487
Test: android.provider.FontsContractTest passes
Change-Id: Ibf24f216179a6481dee1801cd2dfb68c4bb38fac
 2017-04-12 07:24:21 -07:00
Michael Wright
719d1f06fb Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev 
am: 7ecd40c1fc

Change-Id: I003b2cfcdb10a4d9c999ba9cd575561bf7b70086
 2017-04-12 14:23:20 +00:00
TreeHugger Robot
7ecd40c1fc Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev 2017-04-12 14:16:10 +00:00
Seigo Nonaka
5421e81023 Update Typeface.Builder API to reflect API feedback. 
- Stop pooling and remove reset method.
- Introduce overloaded constructors instead of setSource methods.
- Make italic parameter boolean and treat "not called" as
  RESOLVE_BY_FONT_TABLE.
- Remove constants and move them to Typeface with private static
  constant.
- Fix JavaDoc.

Bug: 37082657
Test: android.graphics.cts.TypefaceTest passed
Change-Id: I0c50cf3e2d50c0021f7e12bbb7ed7ae89fa1c2a1
 2017-04-12 07:12:41 -07:00
Jesse Evans
fc1bfc442c Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED 
Renames the instant apps setting to reflect what it is for.

Adds the SystemApi annotation to make this field visible
to the resolver and installer.

Test: existing tests

Change-Id: I1651bb101d69bdfdaa63c004435025c68a33cd8e
 2017-04-12 07:00:51 -07:00
Pavel Grafov
9c58d46e1d Merge "Improve javadocs for SecurityLog class." into oc-dev am: a9a2bbc647 
am: 0b512f27be

Change-Id: I96b2e80ea0eb3b556ae7a48941cdc2579c7957bd
 2017-04-12 12:47:44 +00:00
Pavel Grafov
0b512f27be Merge "Improve javadocs for SecurityLog class." into oc-dev 
am: a9a2bbc647

Change-Id: I7b6b3d6aa1d27cc09a094b3b01fd6530a2d2ed6c
 2017-04-12 12:42:16 +00:00
Pavel Grafov
a9a2bbc647 Merge "Improve javadocs for SecurityLog class." into oc-dev 2017-04-12 12:33:52 +00:00
Tony Mak
35ba7ec539 clear calling identity before calling settings provider 
Test: Run a instrumentation test
cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.ManagedProfileTest#testPhoneAccountVisibility

Change-Id: I29b1dc307e9e127b919aebe4d83ab6311ce36f2d
Fix: 34320197
 2017-04-12 13:01:34 +01:00
Johan Toras Halseth
754e98801b Merge "Add helptext to bu command." into oc-dev am: 487e10e22b 
am: cb449ccf9d

Change-Id: I8cd00b5ea92dc1ab36d6296acad632f943be078f
 2017-04-12 11:18:05 +00:00
Johan Toras Halseth
cb449ccf9d Merge "Add helptext to bu command." into oc-dev 
am: 487e10e22b

Change-Id: Id39d64a9634ed91826f6898e97bdbc213ce111a0
 2017-04-12 11:06:40 +00:00
TreeHugger Robot
487e10e22b Merge "Add helptext to bu command." into oc-dev 2017-04-12 10:59:59 +00:00
Pavel Grafov
103f797a4c Merge "Introduce DISALLOW_BLUETOOTH_SHARING." 2017-04-12 10:17:19 +00:00
Hugo Benichi
07cd52dc7c Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7 am: 65fa0676bf am: 4c63d86db7 
am: 3bc2ac3f82

Change-Id: I0811f7f36dc8ec6d1312d21660abce77bba7a47f
 2017-04-12 10:11:41 +00:00
Hugo Benichi
3bc2ac3f82 Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7 am: 65fa0676bf 
am: 4c63d86db7

Change-Id: Iffc7ff461b685f14ced20ac0cd186f31aa4061ad
 2017-04-12 10:00:32 +00:00
Philip P. Moltmann
a55825b07f Merge "Do not inset autofill highlight" into oc-dev am: ac1c224cdc 
am: 0a87b90e82

Change-Id: Id85d25a445165c38b1f08e5f13744774e4c36fc7
 2017-04-12 09:56:32 +00:00
Kevin Chyn
ec36770783 Merge "Implement enumerate in FingerprintService" into oc-dev am: c2f8949b32 
am: 0a08ec9f29

Change-Id: I033456a0ddbbe2c8da46e8df79637e249e28c9fc
 2017-04-12 09:55:37 +00:00
Hugo Benichi
4c63d86db7 Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7 
am: 65fa0676bf

Change-Id: I3f4e5e226d6a6371a6fed02d472d1cad4995c64a
 2017-04-12 09:55:06 +00:00
Artem Iglikov
ffe2abed60 Merge "Move inner classes of RefactoredBackupManagerService to their own files." 2017-04-12 09:52:36 +00:00
Philip P. Moltmann
0a87b90e82 Merge "Do not inset autofill highlight" into oc-dev 
am: ac1c224cdc

Change-Id: I8e37f008c016d25077fe690477422fd4e7422f29
 2017-04-12 09:50:07 +00:00
Hugo Benichi
65fa0676bf Merge "Captive portal: fix probe urls at network creation" 
am: 923ef69ae7

Change-Id: I82eb06ee1f9d69a1a3ccb5208947bdfcdbba6d81
 2017-04-12 09:50:05 +00:00
Kevin Chyn
0a08ec9f29 Merge "Implement enumerate in FingerprintService" into oc-dev 
am: c2f8949b32

Change-Id: Iae38c3a036374d5556f1020cd3fd472b5e7c819f
 2017-04-12 09:45:43 +00:00
TreeHugger Robot
ac1c224cdc Merge "Do not inset autofill highlight" into oc-dev 2017-04-12 09:43:11 +00:00
Treehugger Robot
923ef69ae7 Merge "Captive portal: fix probe urls at network creation" 2017-04-12 09:38:41 +00:00
TreeHugger Robot
c2f8949b32 Merge "Implement enumerate in FingerprintService" into oc-dev 2017-04-12 09:35:17 +00:00
Abodunrinwa Toki
8b9f1f6756 Merge "Make "Paste as plain text" resource string public." into oc-dev am: 7d4cf66b17 
am: 9815cc5783

Change-Id: Ie26187778f0d01be8926484accc9ecbda49946bd
 2017-04-12 09:24:28 +00:00
Hyunyoung Song
e7b496f177 Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev am: 264f2e40e2 
am: ebcc722b74

Change-Id: Id5087991c8927f7535cb51686317c5730f53471e
 2017-04-12 09:23:04 +00:00
Abodunrinwa Toki
9815cc5783 Merge "Make "Paste as plain text" resource string public." into oc-dev 
am: 7d4cf66b17

Change-Id: I6be7e69dd5b172215494a2736bb7e91e36d7b09c
 2017-04-12 09:17:33 +00:00
Hyunyoung Song
ebcc722b74 Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev 
am: 264f2e40e2

Change-Id: I702c3b790d6b5c0abb9cbc65cdf4e5bfb2b527d9
 2017-04-12 09:12:32 +00:00
TreeHugger Robot
7d4cf66b17 Merge "Make "Paste as plain text" resource string public." into oc-dev 2017-04-12 09:12:23 +00:00
TreeHugger Robot
264f2e40e2 Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev 2017-04-12 09:02:14 +00:00
Julius D'souza
8e9ea90744 Remove the development privelege level from SET_DISPLAY_OFFSET. 
Bug: 36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
 2017-04-11 23:45:35 -07:00
Jorim Jaggi
ccb6e53f80 Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev am: 39608b8556 
am: 11a99404ce

Change-Id: I400130c5126d718d71be7daf5e0685f44eaebd27
 2017-04-12 05:29:17 +00:00
Jorim Jaggi
11a99404ce Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev 
am: 39608b8556

Change-Id: I73dad3226b72bc2b76034c42a77e25be75685a29
 2017-04-12 05:18:45 +00:00