Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,882 Commits 3 Branches 0 Tags
ddfe5d573ec002843324694c2bed723acf1d293e
Commit Graph

195882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
ddfe5d573e Merge "Fix build." into mnc-dev 2015-06-24 05:39:42 +00:00
Lorenzo Colitti
606d311b9a Fix build. 
Per comments in http://ag/704632 , purgeResources was intended to
be hidden.

Bug: 18386420
Change-Id: Iced006878f86c6b7b15dd38f5e704a2f97aeeda5
 2015-06-24 14:37:29 +09:00
Daniel Sandler
0ec462005d Fix build. 
We don't need purgeResources public since it's part of the
ashmem internal optimization.

Change-Id: I65ba7545cf4801a8b97f3ece9b5ee5100c0f1c97
 2015-06-24 01:27:05 -04:00
Jae Seo
1d3e3ca157 Merge "TIF: Use per-user ContentResolver in the TvInputManagerService" into mnc-dev 2015-06-24 04:53:08 +00:00
Brian Carlstrom
45ab734a7a Merge "Add missing NULL check for android_os_Parcel_writeInt" into mnc-dev 2015-06-24 04:36:13 +00:00
Jae Seo
8c375feb68 TIF: Use per-user ContentResolver in the TvInputManagerService 
When switched to a different user (e.g. Restricted profile), the
TvInputManagerService continues to use the TV storage of the previous
user for logging, resulting in failure of the FOREIGN KEY constraint
since channel data for the current user don’t match to the logging data.
This change ensures that the system service uses the proper
ContentResolver when the user is switched.

Bug: 22047202
Change-Id: I870b5bd921e37a5f1219ea66c7a51314c77ddb01
 2015-06-23 20:50:21 -07:00
Svetoslav
df499d5d3b Merge "Update the storage permission group icon" into mnc-dev 2015-06-24 02:20:07 +00:00
Svetoslav
41181ca3e7 Update the storage permission group icon 
bug:21730509

Change-Id: I2ea2d99febac0e57a3ad3e2fc35f629ed0d2f9ec
 2015-06-23 19:18:55 -07:00
Dan Sandler
346872d538 Merge "Allow an icon to carry a tint with it, wherever it goes." into mnc-dev 2015-06-24 02:10:25 +00:00
Daniel Sandler
25a5f30128 Merge "Use ashmem backed bitmaps for passing around notifications" into mnc-dev 2015-06-24 02:09:58 +00:00
Simranjit Singh Kohli
29124960c6 Merge "[Modify LastAuthenticatedTimestamp behaviour]:" into mnc-dev 2015-06-24 01:24:45 +00:00
Brian Carlstrom
849ea02682 Add missing NULL check for android_os_Parcel_writeInt 
All other usages of nativePtr were already checked.

Bug: 21636519
Change-Id: Icc09ce4326e6b05c5a248cc4de84ae231d5690b1
 2015-06-23 18:02:12 -07:00
Svetoslav
c5e43c508f Only current IME and spell checker can access user dictionary 
Change-Id: I6c5716d4d6ea9d5f55a71b6268d34f4faa3ac043
 2015-06-24 00:56:44 +00:00
Ricardo Garcia
2eab06c38f Merge "Fix for SafeMedia logic and CTS tests" into mnc-dev 2015-06-24 00:24:44 +00:00
Chris Craik
c686757a18 Merge "Unify clipping return value behavior - true if not empty" into mnc-dev 2015-06-24 00:12:51 +00:00
Bryce Lee
aef3698f9a Merge "resolved conflicts for merge of 91d2cbf4 to mnc-dev" into mnc-dev 2015-06-24 00:07:54 +00:00
Bryce Lee
d389684bea resolved conflicts for merge of 91d2cbf4 to mnc-dev 
Change-Id: I1c7e2999483a7959630844ecd20f5f37b7896aae
 2015-06-23 17:06:51 -07: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
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
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
Doris Liu
169f87a04b Add enter/exit animation for window provided CAB 
Bug: 21886856
Change-Id: I6b20901c51ce7d74058f6ef866334f622a1fa3a4
 2015-06-23 16:11:07 -07:00
Bryce Lee
91d2cbf447 am 65dca454: Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev 
* commit '65dca454c7a717b001b51d0089e7565ba428ce87':
  Turn off theater mode upon power button press.
 2015-06-23 23:04:26 +00: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 ed5ff51b2c.

Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
 2015-06-23 23:03:55 +00:00
Ricardo Garcia
3a30a76e88 Fix for SafeMedia logic and CTS tests 
Added audio.safemedia.bypass system property to bypass SafeMedia logic on
CTS tests which require guaranteed access to full range of volume levels.

bug: 21779099
Change-Id: I76815a995f08d426218206af7aade491c5debd9e
 2015-06-23 15:54:45 -07:00
Chris Craik
5ec6a2878b Unify clipping return value behavior - true if not empty 
bug:22035484

Change-Id: I23ecca38554a60c590181290900deb0e2c48cea1
 2015-06-23 15:42:43 -07:00
Zach Johnson
12402dafea Merge "Update CarrierService long lived binding API" into mnc-dev 2015-06-23 22:19:25 +00:00
Alan Viverette
9137fcaa92 Merge "Remove isDither(), deprecate setDither()" into mnc-dev 2015-06-23 22:06:15 +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
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
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
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
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