Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,385 Commits 3 Branches 0 Tags
60de280e52ff4e82ee3da01e471542a9045cc61a
Commit Graph

54685 Commits

Author SHA1 Message Date
Alan Viverette
648086eefb am 1fd667a2: am e6c01d05: am c2a30713: Merge "Duplicate description on AccessibilityEvent" 
* commit '1fd667a2c8ad78933aac5f2bf2a6c6a63ac3bb37':
  Duplicate description on AccessibilityEvent
 2015-06-25 01:26:06 +00:00
Alan Viverette
1fd667a2c8 am e6c01d05: am c2a30713: Merge "Duplicate description on AccessibilityEvent" 
* commit 'e6c01d05b4eb2de67bad60991cb2952fb34c3fea':
  Duplicate description on AccessibilityEvent
 2015-06-25 01:12:27 +00:00
Alan Viverette
6aad0fb184 am a54e2886: am 1983fdca: am 10bf27e2: Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev 
* commit 'a54e28865a3a7ce14a09d1e0e8dd16e56be32f18':
  Avoid negative childSpecSize in RelativeLayout
 2015-06-25 00:48:31 +00:00
Adam Powell
f4a4a4c844 am bf7cccdc: am a5e4db2e: am 91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 
* commit 'bf7cccdca1dfe43a9e1956c707615dad2271e6fd':
  Fix ChooserActivity check for still-alive ChooserTargets
 2015-06-25 00:48:26 +00:00
Alan Viverette
a54e28865a am 1983fdca: am 10bf27e2: Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev 
* commit '1983fdca61eecfd964cc8b7842e2b19806fd4d1c':
  Avoid negative childSpecSize in RelativeLayout
 2015-06-25 00:31:43 +00:00
Adam Powell
bf7cccdca1 am a5e4db2e: am 91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 
* commit 'a5e4db2e9025254b80f6c0c380d355e5e0f8234a':
  Fix ChooserActivity check for still-alive ChooserTargets
 2015-06-25 00:31:37 +00:00
Man Cao
80bea9cde1 resolved conflicts for merge of 8fb82074 to master 
Change-Id: I27c7ddeead5a589ae8824f87bf6b42998dc081eb
 2015-06-24 17:28:01 -07:00
Alan Viverette
10bf27e2c9 Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev 2015-06-25 00:09:06 +00:00
Adam Powell
91feb107f2 Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 2015-06-25 00:08:54 +00:00
Alan Viverette
39310d3606 Avoid negative childSpecSize in RelativeLayout 
Bug: 22071351
Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
 2015-06-24 17:03:48 -07:00
Mathieu Chartier
8fb8207412 resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp 
Change-Id: I2f79840f82150eddebfbd549afd1eca28075eb43
 2015-06-24 15:59:18 -07:00
Chris Wren
bb385a7199 am 4d97dbba: am bb9114ff: am 749d66b8: Merge "remove setLatestEventInfo" into mnc-dev 
* commit '4d97dbba00d4f792c0236852d209071224e680ba':
  remove setLatestEventInfo
 2015-06-24 22:52:56 +00:00
Alan Viverette
c2a3071379 Merge "Duplicate description on AccessibilityEvent" 2015-06-24 22:47:03 +00:00
Chris Wren
4d97dbba00 am bb9114ff: am 749d66b8: Merge "remove setLatestEventInfo" into mnc-dev 
* commit 'bb9114ff6dcef85f118afa350c33c2c35a68f41d':
  remove setLatestEventInfo
 2015-06-24 22:39:16 +00:00
Adam Lesinski
87344583e1 am 0ebba0e1: am 53d0d065: am b21a77fe: Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 
* commit '0ebba0e1a66ddf912b9fb7c43727054cb2d63556':
  Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
 2015-06-24 22:22:02 +00:00
Chris Wren
749d66b82f Merge "remove setLatestEventInfo" into mnc-dev 2015-06-24 22:17:45 +00:00
Adam Lesinski
0ebba0e1a6 am 53d0d065: am b21a77fe: Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 
* commit '53d0d0655ca33fbf6a1475a6b97f1a956e5c25f5':
  Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
 2015-06-24 22:11:45 +00:00
Adam Lesinski
b21a77fefc Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 2015-06-24 21:32:38 +00:00
Anthony Hugh
1ebff12972 Merge "Introduce stem keycodes for Wear" 2015-06-24 21:29:42 +00:00
Christopher Tate
46b9d3cf44 am 425bd876: am d1741ef9: am 1af5fe23: Merge "Require that verified intent filters only have http/https <data> decls" into mnc-dev 
* commit '425bd87661e318d715458fdfa5de440a2474d437':
  Require that verified intent filters only have http/https <data> decls
 2015-06-24 21:08:31 +00:00
Christopher Tate
425bd87661 am d1741ef9: am 1af5fe23: Merge "Require that verified intent filters only have http/https <data> decls" into mnc-dev 
* commit 'd1741ef961423db062053ffb0607cd5dd5b927e9':
  Require that verified intent filters only have http/https <data> decls
 2015-06-24 20:55:53 +00:00
Mathieu Chartier
9a65f9ddd0 Merge "Add an AM option to start with allocation tracking" 2015-06-24 20:55:38 +00:00
Adam Powell
c412be6824 Fix ChooserActivity check for still-alive ChooserTargets 
Only prune ChooserTargets if the resolved activity source they came
from is still present after refreshing the list. Compare this directly
against the ComponentName rather than ResolveInfo.equals, as the
latter isn't implemented.

Bug 21953672

Change-Id: I6486bda85c19d7371167affe2a2b80a2668bd734
 2015-06-24 13:54:10 -07:00
Alex Klyubin
768b9647dc am 47686420: am 0a6ac701: am d4e9e0e1: Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev 
* commit '47686420b21ed06286187e1f8a7e4dc4f6e662e5':
  Keymaster INT, LONG and DATE tag values are unsigned.
 2015-06-24 20:40:41 +00:00
Adam Lesinski
c30454c104 Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance() 
Bug:22055550
Change-Id: I1e732e95698daf44bcb223cafde3d3c22746d232
 2015-06-24 13:35:46 -07:00
Man Cao
cfa78b2080 Add an AM option to start with allocation tracking 
The new option "--track-allocation" is to work with the new
allocation tracker in ART.

Bug:20037135
Change-Id: Ic5f8945ab4c1f167c27b05ad0d11d04bac680c1f
 2015-06-24 13:29:29 -07:00
Alex Klyubin
47686420b2 am 0a6ac701: am d4e9e0e1: Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev 
* commit '0a6ac7013b9c42932b18a5a2e35cca9aac0f9337':
  Keymaster INT, LONG and DATE tag values are unsigned.
 2015-06-24 20:27:58 +00:00
Anthony Hugh
9d826681a5 Introduce stem keycodes for Wear 
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I8835cfdba3a8819aae61b47d018c0794ba5f772e
 2015-06-24 13:22:46 -07:00
Christopher Tate
413020a6ca Require that verified intent filters only have http/https <data> decls 
It is malformed to write a single intent filter like this:

  <intent-filter android:autoVerify="true">
    <data android:host="foo.example"
          android:path="/"
          android:scheme="http" />
    <data android:host="*"
          android:path="/custom"
          android:scheme="fooexamplecustomscheme" />
  </intent-filter>

In practice this app is accidentally defining a filter that will match
"http://*".  This is now detected, and will never be auto-verified for
any of the mentioned domains.

Verified intent filters must *only* handle the http & https schemes.

Bug 21920537

Change-Id: I933cddbea23185d242565cac940e1e7a7e4e289b
 2015-06-24 13:16:20 -07:00
Alex Klyubin
d4e9e0e1d6 Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev 2015-06-24 20:03:10 +00:00
Makoto Onuki
2b40e7076d am 9e2d1ed8: am b96bc804: am 0633ae74: Merge "Actually wait for installd" into mnc-dev 
* commit '9e2d1ed898b8e4a4971ddb511e221e3406bf797a':
  Actually wait for installd
 2015-06-24 20:02:07 +00:00
Makoto Onuki
9e2d1ed898 am b96bc804: am 0633ae74: Merge "Actually wait for installd" into mnc-dev 
* commit 'b96bc804169e13701fa249e0a3b3c08d3f2e9808':
  Actually wait for installd
 2015-06-24 19:48:19 +00:00
Makoto Onuki
0633ae7481 Merge "Actually wait for installd" into mnc-dev 2015-06-24 19:25:28 +00:00
Adam Lesinski
53b5f3e68d am fe91754e: am 098204fc: am 67f17099: Merge "Fix unit issue in Slog.wtf output" into mnc-dev 
* commit 'fe91754edd4b899cf238aae11fb186647fdd4ea2':
  Fix unit issue in Slog.wtf output
 2015-06-24 19:22:52 +00:00
Chris Wren
a05db3816b remove setLatestEventInfo 
This has been deprecated since API 11.

Bug: 18510449
Change-Id: Ibd052572aa8c332daf5f6a604afe1925e8998a2b
 2015-06-24 15:18:34 -04:00
Adam Lesinski
fe91754edd am 098204fc: am 67f17099: Merge "Fix unit issue in Slog.wtf output" into mnc-dev 
* commit '098204fca02c2f55ae374915f8bca48701601a29':
  Fix unit issue in Slog.wtf output
 2015-06-24 19:10:58 +00:00
Alan Viverette
936e42bab2 am ff9b80d3: am 44863749: am 9bf9a3a9: Merge "Constrain FastScroller max width to be >= 0" into mnc-dev 
* commit 'ff9b80d3be6c791d22bc681a0da6cacea8820366':
  Constrain FastScroller max width to be >= 0
 2015-06-24 18:57:23 +00:00
Alan Viverette
ff9b80d3be am 44863749: am 9bf9a3a9: Merge "Constrain FastScroller max width to be >= 0" into mnc-dev 
* commit '448637498e66a8b5d2914ed0a99238c0a95c1133':
  Constrain FastScroller max width to be >= 0
 2015-06-24 18:49:35 +00:00
Adam Lesinski
67f170993f Merge "Fix unit issue in Slog.wtf output" into mnc-dev 2015-06-24 18:45:54 +00:00
Adam Lesinski
7b3c7529c7 Fix unit issue in Slog.wtf output 
Bug:22063930
Change-Id: I02add66892eb32b1df7e845b8542beb928d2b3ca
 2015-06-24 11:42:49 -07:00
Alan Viverette
9bf9a3a99e Merge "Constrain FastScroller max width to be >= 0" into mnc-dev 2015-06-24 18:22:33 +00:00
Alan Viverette
c98922ba2f Constrain FastScroller max width to be >= 0 
Bug: 22055552
Change-Id: Ib0bba93e5490ad9d8668c9532f23654a8cb702d9
 2015-06-24 10:22:02 -07:00
Esteban Talavera
bfd9fd604c am b8abc408: am 833af023: am e4ffec21: Merge "Reset permission policy to default when device owner goes away" into mnc-dev 
* commit 'b8abc408246dc1c5f25aa578015bab652b8b6101':
  Reset permission policy to default when device owner goes away
 2015-06-24 17:12:19 +00:00
Esteban Talavera
b8abc40824 am 833af023: am e4ffec21: Merge "Reset permission policy to default when device owner goes away" into mnc-dev 
* commit '833af023a1ffe0dfa40831c6f71af48e55cc29bb':
  Reset permission policy to default when device owner goes away
 2015-06-24 17:05:23 +00:00
Makoto Onuki
c8a2cfed01 Actually wait for installd 
Bug 19337445

Change-Id: I70bdaa0ac3695ac9d03ba34fe9d35fe775a5300d
 2015-06-24 09:52:58 -07:00
Michael Wright
0c83048b8c am bc12a725: am 02791a78: am 5edd0e06: Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev 
* commit 'bc12a725e706ad077c1785c8328af0a569448d0c':
  Add new SOURCE_BLUETOOTH_STYLUS.
 2015-06-24 16:48:01 +00:00
Esteban Talavera
e4ffec210e Merge "Reset permission policy to default when device owner goes away" into mnc-dev 2015-06-24 16:42:36 +00:00
Michael Wright
bc12a725e7 am 02791a78: am 5edd0e06: Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev 
* commit '02791a78f1673ff970446df7025edee19861cca1':
  Add new SOURCE_BLUETOOTH_STYLUS.
 2015-06-24 16:34:18 +00:00
Esteban Talavera
28b9570d02 Reset permission policy to default when device owner goes away 
Otherwise after the Device Owner is gone, runtime
permissions might still be auto granted/denied.
I understand that there are many other policies that
we don't reset after the device/profile owner goes
away (e.g. keyguard enabled/disabled). At least now
we have a single method when we could clear the
ones that we care about.

Bug: 21889278
Change-Id: I6997655e6ef6d474bd25ae1c323eca5b17944b16
 2015-06-24 17:19:19 +01:00
Michael Wright
5edd0e06d5 Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev 2015-06-24 16:12:22 +00:00