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

314694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
3a32d35723 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev 
am: 2e86be7653

Change-Id: Idec10c8c0aadccabcd639b5a02e426dc677b9f14
 2017-04-14 05:22:04 +00:00
Romain Guy
299ae2f422 Merge "Fix javadoc typos" into oc-dev 
am: 4b6e82d237

Change-Id: I03e9608a10deb04d3821bf411c033300bb6272ee
 2017-04-14 05:20:55 +00:00
Andrii Kulian
aa412973d9 Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev 
am: c66b6ff997

Change-Id: I1db901364853ceb5eaec1ac757fd6974db7ea2a9
 2017-04-14 05:17:33 +00:00
Winson Chung
2e86be7653 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev 2017-04-14 05:12:54 +00:00
TreeHugger Robot
4b6e82d237 Merge "Fix javadoc typos" into oc-dev 2017-04-14 05:06:43 +00:00
Andrii Kulian
c66b6ff997 Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev 2017-04-14 05:05:25 +00:00
Jesse Evans
783026710d Merge "Fix instant app filtering in ApplicationsState" into oc-dev 
am: 9bdaa9c9fa

Change-Id: I1f3b4dfe6c6f9f53c9af5483ab4b31726026d219
 2017-04-14 04:56:33 +00:00
Winson Chung
7031cdda50 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev 
am: 4191d99614

Change-Id: I257467c0f950af3a1b27bbff21e466323babe513
 2017-04-14 04:50:03 +00:00
TreeHugger Robot
9bdaa9c9fa Merge "Fix instant app filtering in ApplicationsState" into oc-dev 2017-04-14 04:49:43 +00:00
TreeHugger Robot
4191d99614 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev 
* changes:
  Fixing missing movement bounds notification to SystemUI.
  Fixing animating bounds regression.
  Tightening up rotation behavior for PIP (2/3)
  Tightening up rotation behavior for PIP (1/3)
 2017-04-14 04:39:01 +00:00
Svet Ganov
489cef380a Merge "Allow custom buttons in autofill UI" into oc-dev 
am: 249c4d709a

Change-Id: I25d94fe03626642ee8f456a78cfb502e1ca53b55
 2017-04-14 04:36:40 +00:00
Android Build Merger (Role)
0bf753d2e5 Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am: 2a30085e5c" into oc-dev-plus-aosp 2017-04-14 04:34:25 +00:00
Dmitry Dementyev
11e1805ab3 Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev 
am: 2a30085e5c

Change-Id: I2f583203d8b97f0a56c8b911d20098a3ed1772eb
 2017-04-14 04:33:27 +00:00
Android Build Merger (Role)
562e577b1c Merge "Merge changes Id0d536ff,I4fcd0ad7 into oc-dev am: 0e8090b10e" into oc-dev-plus-aosp 2017-04-14 04:33:07 +00:00
Hugo Benichi
ed1e91e4f4 Merge changes Id0d536ff,I4fcd0ad7 into oc-dev 
am: 0e8090b10e

Change-Id: I0b432e9d7aa5654a0aeac1d3d0a09e624bcbc9bc
 2017-04-14 04:32:17 +00:00
Android Build Merger (Role)
224b710a4f Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev am: f5d5e5e4bf" into oc-dev-plus-aosp 2017-04-14 04:31:49 +00:00
Jeff Sharkey
4e544771dd Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev 
am: f5d5e5e4bf

Change-Id: I2af664620bdaf6fa4551aade80e56decf0995838
 2017-04-14 04:30:50 +00:00
Android Build Merger (Role)
e9277ebe4a Merge "Merge "Add more doc to ColorSpace.getName()" into oc-dev am: 4cae059bb9" into oc-dev-plus-aosp 2017-04-14 04:30:29 +00:00
Romain Guy
c20a2aaa08 Merge "Add more doc to ColorSpace.getName()" into oc-dev 
am: 4cae059bb9

Change-Id: If6674f4884a8d0e4c36072125cbcc7895a49abe5
 2017-04-14 04:29:39 +00:00
Android Build Merger (Role)
c1c3855397 Merge "Merge "Turn down dynamic toggle for background restriction policy" into oc-dev am: 59047acea7" into oc-dev-plus-aosp 2017-04-14 04:29:20 +00:00
Christopher Tate
637c5b11a3 Merge "Turn down dynamic toggle for background restriction policy" into oc-dev 
am: 59047acea7

Change-Id: Ibd345b735d1743f2c253bc0d0937a44573343dd0
 2017-04-14 04:28:31 +00:00
Android Build Merger (Role)
900f022984 Merge "Merge "Visual changes to PIP drag to dismiss UI" into oc-dev am: 59c124b755" into oc-dev-plus-aosp 2017-04-14 04:28:11 +00:00
Mady Mellor
65aed22863 Merge "Visual changes to PIP drag to dismiss UI" into oc-dev 
am: 59c124b755

Change-Id: I38781516da59f84f829699e2ef9c1db27e7578b6
 2017-04-14 04:27:08 +00:00
Android Build Merger (Role)
37933ae25b Merge "Check for non-null parent before delegating to it am: 3a74243ae4" into oc-dev-plus-aosp 2017-04-14 04:26:48 +00:00
Svet Ganov
162a93ca1c Check for non-null parent before delegating to it 
am: 3a74243ae4

Change-Id: I294345cde604bf61175297ceb5ab11d23dbf6eb7
 2017-04-14 04:26:02 +00:00
Rebecca Silberstein
01d3ad5cf2 Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 am: 6fc5051613 
am: 2f7a169618

Change-Id: Id0a6bc3452b909ac22704ab76b2811259f94147f
 2017-04-14 04:25:57 +00:00
TreeHugger Robot
249c4d709a Merge "Allow custom buttons in autofill UI" into oc-dev 2017-04-14 04:22:10 +00:00
Rebecca Silberstein
2f7a169618 Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 
am: 6fc5051613

Change-Id: If99dc4527f2d85d803d7ef8eabfbb8601be11071
 2017-04-14 04:19:02 +00:00
Andreas Huber
71a840befa Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev 
am: 9b2ed2b7c4

Change-Id: Ibc670da31571add92a312b7673be376be67f9072
 2017-04-14 04:17:37 +00:00
Roozbeh Pournader
b9e8d31eca Merge "Add Adlam font to fonts.xml" into oc-dev 
am: 1ad7ff32b1

Change-Id: Ic5244c47a1d31e75df484decc65195fd381bf8b5
 2017-04-14 04:14:25 +00:00
Yifan Hong
38bf613c0f Merge "Add Java API for libvintf." into oc-dev 
am: c223d70e64

Change-Id: I4401faccfb5c6be29635983ec07dedb32b7f8c74
 2017-04-14 04:13:04 +00:00
Rebecca Silberstein
6fc5051613 Merge "Add a default SSID prefix for local only hotspot" 
am: e98a2942a4

Change-Id: I3981dbbaa2eee7e54e8c8fd2d9825a3c0866bdb2
 2017-04-14 04:12:34 +00:00
Ta-wei Yen
63668e4396 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev 
am: ad989b1711

Change-Id: I7a9f56a2585584fdce87025cd07c5c526c9bc176
 2017-04-14 04:11:29 +00:00
Rebecca Silberstein
e98a2942a4 Merge "Add a default SSID prefix for local only hotspot" 2017-04-14 04:03:50 +00:00
TreeHugger Robot
2a30085e5c Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev 2017-04-14 03:53:52 +00:00
TreeHugger Robot
0e8090b10e Merge changes Id0d536ff,I4fcd0ad7 into oc-dev 
* changes:
  Connectivity metrics: add transports to connect stats
  Connectivity metrics: log DnsEvents in-band
 2017-04-14 03:43:02 +00:00
TreeHugger Robot
f5d5e5e4bf Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev 2017-04-14 03:37:37 +00:00
TreeHugger Robot
4cae059bb9 Merge "Add more doc to ColorSpace.getName()" into oc-dev 2017-04-14 03:10:16 +00:00
Romain Guy
b3f69261c5 Fix javadoc typos 
Bug: 37328228
Test: compiles
Change-Id: I75323ef5afb30381aa473ebe7172ebb145eac8f3
 2017-04-13 20:06:41 -07:00
TreeHugger Robot
59047acea7 Merge "Turn down dynamic toggle for background restriction policy" into oc-dev 2017-04-14 03:00:24 +00:00
Jesse Evans
ad2b77565c Fix instant app filtering in ApplicationsState 
This fixes instant apps showing up as installed apps in the settings
UI where they should not be (namely the opening links page).

Test: Added tests for the filter
      runtest -x packages/SettingsLib/tests/integ

Bug: 37108030
Change-Id: I0fc6cfd237d470a1f4dde7b2db38d8b3643ee6f7
 2017-04-13 19:48:48 -07:00
TreeHugger Robot
59c124b755 Merge "Visual changes to PIP drag to dismiss UI" into oc-dev 2017-04-14 02:40:01 +00:00
Lorenzo Colitti
d6af00f5e4 resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp 
Test: builds
Change-Id: I786ece9b82e47691855c8549e174345080964b91
 2017-04-14 11:37:12 +09:00
Svet Ganov
3a74243ae4 Check for non-null parent before delegating to it 
Test: manual

bug:37289681

Change-Id: If3055747471d4b7771256d8adaaa08b73641c09d
 2017-04-14 02:31:53 +00:00
Winson Chung
32c566fe6e Fixing missing movement bounds notification to SystemUI. 
- When WM updates from a configuration change, ensure that we update the
  pinned stack controller even if there is currently no pinned stack.
- Also finish the menu activity once an activity is unpinned.

Bug: 36879891
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I789945c1783693cf4b4e3d6663548c8669784001
 2017-04-13 19:27:31 -07:00
TreeHugger Robot
9b2ed2b7c4 Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev 2017-04-14 02:13:27 +00:00
TreeHugger Robot
1ad7ff32b1 Merge "Add Adlam font to fonts.xml" into oc-dev 2017-04-14 02:04:36 +00:00
TreeHugger Robot
c223d70e64 Merge "Add Java API for libvintf." into oc-dev 2017-04-14 02:02:08 +00:00
Jeff Sharkey
e5e2569a1f Relax enforcement of GET_USAGE_STATS permission. 
This matches the logic used in all other places where we check for
this app-op.

Test: builds, boots
Bug: 37315351
Change-Id: I1fef7d30709d24c3f8978d33271a15b37b2ccc26
 2017-04-13 19:54:51 -06:00
Hugo Benichi
5eb9053c4e Connectivity metrics: add transports to connect stats 
This patch groups connect() events per netId. It adds netid and
transport information to serialized ConnectStatistics events.

Test: updated NetdEventListenerServiceTest
      updated IpConnectivityMetricsTest
      $ runtest frameworks-net passes
Bug: 34901696
Change-Id: Id0d536ff723ded5c26eafe0bb138ba75ba2856c5
Merged-In: I4769496383943e714a1d350c298e093c2ed57477

(cherry picked from commit dfc2cc5857199345e08f07977b79b20292f964a2)
 2017-04-14 01:44:52 +00:00