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

198058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
423c824b50 am d1e62d9d: Merge "Remove default activity title to prevent talkback from..." into mnc-dev 
* commit 'd1e62d9dfd0c995084046188fbde7dac40401162':
  Remove default activity title to prevent talkback from...
 2015-06-24 00:12:22 +00:00
Makoto Onuki
d1e62d9dfd Merge "Remove default activity title to prevent talkback from..." into mnc-dev 2015-06-24 00:04:43 +00:00
Makoto Onuki
9feac1425c Remove default activity title to prevent talkback from... 
reading the wrong title.

We get a title from DocumentProvider with an async task, and by the time we
get it, it's *usually* too late and talkback end up reading the default title.

Bug 20041072

Change-Id: I7686fe4ae4c157ebfc07bd8b895c4cfdf99c057a
 2015-06-23 16:51:45 -07:00
Alan Viverette
0ca0251263 am b1825fea: Merge "Throw IAE on invalid measure spec size" into mnc-dev 
* commit 'b1825feac000e8d7999b0b956f104e989ea34d05':
  Throw IAE on invalid measure spec size
 2015-06-23 23:47:34 +00:00
Dianne Hackborn
1e7b818d86 am fcaed606: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit 'fcaed60650ed8e44a416e7ba05c281aae643b0c6':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-23 23:47:27 +00:00
Ruben Brunk
5b9021f2fa am a39fcc58: Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev 
* commit 'a39fcc58753000435e963b473bad954a337604f2':
  Update DngCreator to handle pre-correction dimens.
 2015-06-23 23:47:21 +00:00
Alan Viverette
b1825feac0 Merge "Throw IAE on invalid measure spec size" into mnc-dev 2015-06-23 23:41:03 +00:00
Dianne Hackborn
fcaed60650 Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 2015-06-23 23:34:22 +00:00
Ruben Brunk
a39fcc5875 Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev 2015-06-23 23:33:22 +00:00
Sharvil Nanavati
57927d9b1c am 8a0fd130: Merge "resolved conflicts for merge of 64a4858b to mnc-dev" into mnc-dev 
* commit '8a0fd13081af16b18aaca6cb38ed9b252169df56':
  Dump bonded Bluetooth devices in dumpsys.
 2015-06-23 23:31:14 +00:00
Doris Liu
5d0dedd1c3 am 0ab73134: Merge "Add enter/exit animation for window provided CAB" into mnc-dev 
* commit '0ab731340b162a14eb49b8df78a0e96eb6e3a934':
  Add enter/exit animation for window provided CAB
 2015-06-23 23:31:08 +00:00
Sharvil Nanavati
8a0fd13081 Merge "resolved conflicts for merge of 64a4858b to mnc-dev" into mnc-dev 2015-06-23 23:24:10 +00:00
Alan Viverette
ac6cfb32fe Throw IAE on invalid measure spec size 
Crash immediately so that we can track down the cause. If we let it
through, we'll hit an ISE later in dispatchVsync() and never know why.

Bug: 21948478
Change-Id: I84edf93cdf09d755419e18a7606b7b6cbd059956
 2015-06-23 16:23:49 -07:00
Sharvil Nanavati
e7908c7ff2 resolved conflicts for merge of 64a4858b to mnc-dev 
Change-Id: I9340b816232285853740c03d5e9898fdd019ff0e
 2015-06-23 16:23:06 -07:00
Ruben Brunk
b8f4c6ab1e Update DngCreator to handle pre-correction dimens. 
Bug: 20491394
Change-Id: I0cdf7cec104bcb5683139c81fc52c8a0a7d2365c
 2015-06-23 16:23:03 -07:00
Doris Liu
0ab731340b Merge "Add enter/exit animation for window provided CAB" into mnc-dev 2015-06-23 23:20:02 +00:00
Svetoslav Ganov
4475dbcacb am 2c99ea35: Merge "Remove not needed contacts related permissions." into mnc-dev 
* commit '2c99ea3524bba58f87a9fefad79aa136538b6e0e':
  Remove not needed contacts related permissions.
 2015-06-23 23:19:49 +00:00
Doris Liu
169f87a04b Add enter/exit animation for window provided CAB 
Bug: 21886856
Change-Id: I6b20901c51ce7d74058f6ef866334f622a1fa3a4
 2015-06-23 16:11:07 -07:00
Svetoslav Ganov
2c99ea3524 Merge "Remove not needed contacts related permissions." into mnc-dev 2015-06-23 23:04:20 +00:00
Svetoslav Ganov
6d2c0e5ee2 Remove not needed contacts related permissions. 
This reverts commit ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.

Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
 2015-06-23 23:03:55 +00:00
Zach Johnson
9a8f0138c5 am 12402daf: Merge "Update CarrierService long lived binding API" into mnc-dev 
* commit '12402dafeaf2ec8255d6331d3e82028d694b87d7':
  Update CarrierService long lived binding API
 2015-06-23 22:30:09 +00:00
Zach Johnson
12402dafea Merge "Update CarrierService long lived binding API" into mnc-dev 2015-06-23 22:19:25 +00:00
Alan Viverette
c7201180d1 am 9137fcaa: Merge "Remove isDither(), deprecate setDither()" into mnc-dev 
* commit '9137fcaa92e70f7ade386f2905d55b22a1362add':
  Remove isDither(), deprecate setDither()
 2015-06-23 22:17:05 +00:00
Alan Viverette
9137fcaa92 Merge "Remove isDither(), deprecate setDither()" into mnc-dev 2015-06-23 22:06:15 +00:00
Todd Kennedy
126b587531 am c6040826: Merge "Skip upgrade keys for adopted storage" into mnc-dev 
* commit 'c60408264c7fe19d2f1f3550556f7e6bc1ca716d':
  Skip upgrade keys for adopted storage
 2015-06-23 21:49:43 +00:00
Todd Kennedy
b6384b5523 am c0039894: Merge "Handle volume benchmark timeout" into mnc-dev 
* commit 'c00398948811690728ed4909f87d01c24a8a0938':
  Handle volume benchmark timeout
 2015-06-23 21:49:39 +00:00
Adam Lesinski
05feded4f1 am 8144aa2e: Merge "Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS" into mnc-dev 
* commit '8144aa2e9a732be6ba66c385a590e07ec59c5f77':
  Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS
 2015-06-23 21:43:07 +00:00
Jae Seo
b497945f12 am 1d462aa6: Merge "TIF: Always invalidate the session callback when resetting TvView" into mnc-dev 
* commit '1d462aa6f89b8b0d4c467c4f3244215b01c0baa8':
  TIF: Always invalidate the session callback when resetting TvView
 2015-06-23 21:43:02 +00:00
Todd Kennedy
c60408264c Merge "Skip upgrade keys for adopted storage" into mnc-dev 2015-06-23 21:42:06 +00:00
Todd Kennedy
c003989488 Merge "Handle volume benchmark timeout" into mnc-dev 2015-06-23 21:41:20 +00:00
Todd Kennedy
8101ee6884 Handle volume benchmark timeout 
If a volume benchmark operation times out, we don't want to show
a cryptic toast message. Instead, we return a very large integer
[eg Long.MAX_INT]. The storage wizard can then use this value
to show an appropriate dialog if it chooses.

Bug: 21376364
Change-Id: I3d97336e19c93511cfff2cbdb2f07ab033a1143d
 2015-06-23 14:40:32 -07:00
Adam Lesinski
8144aa2e9a Merge "Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS" into mnc-dev 2015-06-23 21:37:20 +00:00
Zach Johnson
08a244cee8 Update CarrierService long lived binding API 
Should take a metadata approach instead of a separate
intent.

b/21080696

Change-Id: Ib6e2ec0d3258e419aa14ae9e598a8147505feb84
 2015-06-23 14:31:13 -07:00
Alan Viverette
81e7dbddf1 Remove isDither(), deprecate setDither() 
Bug: 22013358
Change-Id: I37b11a94edc431a88522c6c056b76b045daa61d6
 2015-06-23 14:30:40 -07:00
Jae Seo
1d462aa6f8 Merge "TIF: Always invalidate the session callback when resetting TvView" into mnc-dev 2015-06-23 21:28:00 +00:00
Adam Lesinski
ce5bcf8b89 am ad5f292b: Merge "Extend the time between WiFi energy samples" into mnc-dev 
* commit 'ad5f292b037a61b9975b1b8d10a1b4202ac533cf':
  Extend the time between WiFi energy samples
 2015-06-23 21:21:54 +00:00
Adam Lesinski
f374a4bc2a Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS 
Bug:22008542
Change-Id: Ifb4565ec8077e88596f0304328c083c7d1c9db04
 2015-06-23 14:15:04 -07:00
Adam Lesinski
ad5f292b03 Merge "Extend the time between WiFi energy samples" into mnc-dev 2015-06-23 21:12:35 +00:00
oleksii stepanian
3285efc02c am e6953913: Merge "Send installerUid for verification when using PackageInstaller." into mnc-dev 
* commit 'e6953913536155a5d1f78d184e67a74f9acbe1c1':
  Send installerUid for verification when using PackageInstaller.
 2015-06-23 21:07:39 +00:00
Sharvil Nanavati
64a4858b32 resolved conflicts for merge of 7c250056 to lmp-mr1-ub-dev 
Change-Id: I8ec2e76756e61a6e6bbe85ca699facbde1c1fbc7
 2015-06-23 14:07:26 -07:00
oleksii stepanian
e695391353 Merge "Send installerUid for verification when using PackageInstaller." into mnc-dev 2015-06-23 20:58:34 +00:00
Jeff Davidson
8f528531e1 am 8d9ad193: Merge "Default permissions for carrier apps." into mnc-dev 
* commit '8d9ad19341e19256651ef86274a4382f2c09b279':
  Default permissions for carrier apps.
 2015-06-23 20:55:59 +00:00
Jeff Davidson
8d9ad19341 Merge "Default permissions for carrier apps." into mnc-dev 2015-06-23 20:43:06 +00:00
Adam Lesinski
06f46cb320 Extend the time between WiFi energy samples 
With bursty WiFi traffic, we end up sampling the WiFi controller's
energy data quite a lot. Extend the timeout so that we sample
once there has been no activity for 15 seconds.

Note: Once the WiFi radio goes down after being active, it can come back and be
active in less than 15 seconds, which means we may sample twice quickly.

Bug:21478443
Change-Id: I99081b664f8a33fef734bc55eef4d33ac297e83a
 2015-06-23 13:42:53 -07:00
Alex Klyubin
168af812db am 90c9e4eb: Merge "Keymaster key validity dates are optional." into mnc-dev 
* commit '90c9e4eb54a9c4b4fbc821b1992f2aee2f2b1e8c':
  Keymaster key validity dates are optional.
 2015-06-23 20:42:49 +00:00
Chris Wren
95470bf097 am f1b25bd4: fix the build: remove duplicated line 
* commit 'f1b25bd43464b2603da98ce5f03f41d9819d2374':
  fix the build: remove duplicated line
 2015-06-23 20:42:45 +00:00
Alex Klyubin
90c9e4eb54 Merge "Keymaster key validity dates are optional." into mnc-dev 2015-06-23 20:35:30 +00:00
Chris Wren
f1b25bd434 fix the build: remove duplicated line 
Change-Id: I0ae6443dd7237b8cce14d12967edd0afb8d34196
 2015-06-23 16:28:33 -04:00
Dianne Hackborn
8ecf16d186 Fix issue #20654534: API Review: android.app.assist 
Remove the old ViewAssistStructure class.

Change-Id: I5eca7bc7af93cda5f654c9094a3aa07fe4958da2
 2015-06-23 13:09:21 -07:00
Jae Seo
7a91fd6221 am ac2c8908: Merge "TIF: Add more description to the poster art and thumbnail columns" into mnc-dev 
* commit 'ac2c8908114534b47822a483e540d0071dd24e5f':
  TIF: Add more description to the poster art and thumbnail columns
 2015-06-23 20:04:58 +00:00