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

221990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip P. Moltmann
ca3f938326 Merge "Switch add icons to the default menu add icon" 2015-11-16 20:16:23 +00:00
Filip Gruszczynski
608797e210 Remove unnecessary DisplayContent.mDisplaySizeLock synchronization. 
All operations are performed with WindowManagerService.mWindowMap lock
held, therefore the second lock is not necessary.

Change-Id: I762fb322ddeb8b45191a3d297de0d33a10674f8a
 2015-11-16 12:12:15 -08:00
Philip P. Moltmann
7dfe4f64dc Switch add icons to the default menu add icon 
Also use the material search icon.

Bug: 22563699
Change-Id: Iff7c6b5cac8a9f0bf282e061d2ed09c4c0fb480a
 2015-11-16 11:58:46 -08:00
Steve McKay
c89cc4419e Merge "Add test size annotations to docsui tests." 2015-11-16 19:47:53 +00:00
Jeffrey Vander Stoep
25bfb2b3d8 Merge "pm: selinux support for AutoPlay apps" 2015-11-16 19:38:33 +00:00
Erik Wolsheimer
fa17e61291 Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c am: 7698dd970f 
am: ae4ab3501a

* commit 'ae4ab3501a0400940ace2d0bfdf0d7021c740603':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 19:26:12 +00:00
Erik Wolsheimer
ae4ab3501a Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c 
am: 7698dd970f

* commit '7698dd970fbfb81fcdc700827c1620440c6e81a1':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 19:20:35 +00:00
Erik Wolsheimer
7698dd970f Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e 
am: 529893f84c

* commit '529893f84cc62893ad6111816954b0bc7c829cee':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 19:12:17 +00:00
Erik Wolsheimer
529893f84c Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 
am: b45defae8e

* commit 'b45defae8e61a4fa3aba9dd08480861d10f5982a':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 19:03:52 +00:00
Erik Wolsheimer
b45defae8e Log errno when dup fd cannot be allocated BUG: 25165471 
am: 211abad3b9

* commit '211abad3b92b70dd094949c79f67e686c940fa0c':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 18:55:29 +00:00
Selim Cinek
54d8539d09 Merge "Fixed a crash with the heads up manager" 2015-11-16 18:52:32 +00:00
Selim Cinek
81831c9cd3 Merge "Fixed error in GroupManager" 2015-11-16 18:46:33 +00:00
Selim Cinek
f5fae39a55 Merge "Fixed a bug where a notification could get removed" 2015-11-16 18:44:56 +00:00
Selim Cinek
d18a45743f Merge "Allow clicking fullscreen intent notifications now" 2015-11-16 18:43:33 +00:00
Erik Wolsheimer
211abad3b9 Log errno when dup fd cannot be allocated 
BUG: 25165471

Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
 2015-11-16 10:29:20 -08:00
Tony Mantler
80ac37d033 Merge "Move some methods to DeviceInfoUtils in SettingsLib" 2015-11-16 18:12:51 +00:00
Geoff Mendal
e490a14629 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5 -s ours 
am: f39bb92f5a  -s ours

* commit 'f39bb92f5a90b9d3e2e958535c16eee5a7aacd97':
  Import translations. DO NOT MERGE
 2015-11-16 17:50:57 +00:00
Alan Viverette
5482308a0a Merge "Clean up usage of temporary TypedValue in Resources" 2015-11-16 17:46:58 +00:00
Tony Mantler
e92cf6d739 Move some methods to DeviceInfoUtils in SettingsLib 
Change-Id: I646c89c2803e4386a4b24f10ec186871768e7239
 2015-11-16 09:44:52 -08:00
Geoff Mendal
f39bb92f5a Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 812794f0f5  -s ours

* commit '812794f0f5dfba607bcdd648611317df10ca0d49':
  Import translations. DO NOT MERGE
 2015-11-16 17:44:03 +00:00
Geoff Mendal
812794f0f5 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2015-11-16 17:39:29 +00:00
Geoff Mendal
19c3f7fa2f Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours am: ee144ce3ba -s ours 
am: 62f520fc88  -s ours

* commit '62f520fc8872fed4b5289afdd9ab94141711e73a':
  Import translations. DO NOT MERGE
 2015-11-16 17:37:07 +00:00
Geoff Mendal
fd1c8b3cda Import translations. DO NOT MERGE 
Change-Id: Ie5a78ca8aadcfd06937b3c917e9d7c99cdc1da0c
Auto-generated-cl: translation import
 2015-11-16 18:31:23 +01:00
Geoff Mendal
62f520fc88 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours 
am: ee144ce3ba  -s ours

* commit 'ee144ce3baec585e19da454de95d05ed0f1a0bcf':
  Import translations. DO NOT MERGE
 2015-11-16 17:29:04 +00:00
Geoff Mendal
ee144ce3ba Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 
am: f34cefdc2d  -s ours

* commit 'f34cefdc2d7d2e1b702a5af8f31bdebba455f81d':
  Import translations. DO NOT MERGE
 2015-11-16 17:22:23 +00:00
Geoff Mendal
f34cefdc2d Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2015-11-16 17:17:31 +00:00
Geoff Mendal
f9489a4fb7 Import translations. DO NOT MERGE 
Change-Id: I1d71c3b6382fb097a4c33f0210138537b48215f0
Auto-generated-cl: translation import
 2015-11-16 18:16:28 +01:00
Geoff Mendal
8116caa954 Merge "Import translations. DO NOT MERGE" 2015-11-16 17:04:31 +00:00
Geoff Mendal
1c1aed1c12 Import translations. DO NOT MERGE 
Change-Id: Ieb29e82bd8fe81930b730e3334f59d496dfd785c
Auto-generated-cl: translation import
 2015-11-16 18:01:32 +01:00
Filip Gruszczynski
362c722245 Merge "Split ActivityStack.ensureActivitiesVisibleLocked." 2015-11-16 16:58:13 +00:00
Mark Salyzyn
9f5de191e8 Merge "Revert "jni: is loggable speedup, not within signal"" 2015-11-16 16:30:42 +00:00
Mark Salyzyn
b761d04824 Revert "jni: is loggable speedup, not within signal" 
(cherry pick of commit 421d434818aae0977b5b044dd88555a2261efac1)

This reverts commit c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.

Bug: 25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
 2015-11-16 08:29:03 -08:00
Alan Viverette
49f3bc3dbf Merge "Obtain cached drawables using the correct Resources object" 2015-11-16 15:22:19 +00:00
Alan Viverette
4d07bc99f0 Clean up usage of temporary TypedValue in Resources 
Reduces the amount of time that a lock is held and reduces the scope of
the lock to only manage the temporary TypedValue. Also ensures that the
typed value is consistently returned to the (single item) pool.

Additionally, performs some refactoring:
- removes unused variables and constants
- moves the NotFoundException cause into the constructor for consistency
  with other Exceptions
- inlines sPreloadedDensity which was not used anywhere
- fixes line wrapping and indentation in nearby code

Aside from improvements to locking, there are no functional changes in
this CL.

Change-Id: I8c3059261e3cc2288a086e6637ab946e0b7d3741

Clean up usage of temporary TypedValue in Resources

Reduces the amount of time that a lock is held and reduces the scope of
the lock to only manage the temporary TypedValue. Also ensures that the
typed value is consistently returned to the (single item) pool.

Additionally, performs some refactoring:
- removes unused variables and constants
- moves the NotFoundException cause into the constructor for consistency
  with other Exceptions
- inlines sPreloadedDensity which was not used anywhere
- fixes line wrapping and indentation in nearby code

Aside from improvements to locking, there are no functional changes in
this CL.

Change-Id: I8c3059261e3cc2288a086e6637ab946e0b7d3741
 2015-11-16 10:19:12 -05:00
Alan Viverette
477f3d092d Obtain cached drawables using the correct Resources object 
Previously we were discarding the Resources when forwarding from the
two-arg factory method to the one-arg method. This CL also updates the
documentation for ConstantState to be slightly more comprehensive.

Bug: 25688078
Change-Id: I4fbbf43f95fe792fa6f0bf9db8fd9a7cbfa51d1d
 2015-11-16 10:12:44 -05:00
Geoff Mendal
3adea47fd9 Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours am: 4510d17575 -s ours am: fb17593356 -s ours 
am: b781c9593f  -s ours

* commit 'b781c9593f1ccf0dba818a52285c531669d06bf8':
  Import translations. DO NOT MERGE
 2015-11-16 14:42:00 +00:00
Geoff Mendal
b781c9593f Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours am: 4510d17575 -s ours 
am: fb17593356  -s ours

* commit 'fb175933566d5869e4d069334abec82f67665083':
  Import translations. DO NOT MERGE
 2015-11-16 14:26:51 +00:00
Robin Lee
edbdb31274 Merge "Take out nested synchronisation from LockdownVpn" 2015-11-16 14:22:54 +00:00
Geoff Mendal
fb17593356 Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours 
am: 4510d17575  -s ours

* commit '4510d175753dc4439411b19963cb4bd8bde2c2f4':
  Import translations. DO NOT MERGE
 2015-11-16 14:10:31 +00:00
Geoff Mendal
4510d17575 Import translations. DO NOT MERGE am: 83d65fea01 -s ours 
am: a6c50551cd  -s ours

* commit 'a6c50551cdcbb70d5d65dbfe68c23e74eea245d9':
  Import translations. DO NOT MERGE
 2015-11-16 13:54:50 +00:00
Geoff Mendal
a6c50551cd Import translations. DO NOT MERGE 
am: 83d65fea01  -s ours

* commit '83d65fea01c4233c80161acdd69b64fa559c3749':
  Import translations. DO NOT MERGE
 2015-11-16 13:38:58 +00:00
Geoff Mendal
857ff2e93a Merge "Import translations. DO NOT MERGE" 2015-11-16 13:35:10 +00:00
Geoff Mendal
97f8aae2f8 Import translations. DO NOT MERGE 
Change-Id: Ifa6072a51df82cd0f473908393b500ff8a0d5ec0
Auto-generated-cl: translation import
 2015-11-16 05:34:04 -08:00
Geoff Mendal
f905b16c71 Import translations. DO NOT MERGE 
Change-Id: Ib120f1b756f35c5e144e4b35a2eae6445ccdced3
Auto-generated-cl: translation import
 2015-11-16 05:31:02 -08:00
Geoff Mendal
83d65fea01 Import translations. DO NOT MERGE 
Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04
Auto-generated-cl: translation import
 2015-11-16 14:18:40 +01:00
Daichi Hirono
27462ebd4e Merge "Start to use MtpDatabase in RootScanner." 2015-11-16 09:07:51 +00:00
Daichi Hirono
dc47344660 Start to use MtpDatabase in RootScanner. 
Change-Id: Id99cb61ad8680529b5ee502ca5bb2b3cdd143235
 2015-11-16 17:49:20 +09:00
Sungsoo Lim
bc195a6b27 Merge "Prevent NPE in MediaSessionService" 2015-11-16 08:10:27 +00:00
Sungsoo Lim
2189f58ec5 MediaBrowser: Handle null results properly in onLoadChildren 
Bug: 19127753
Change-Id: I7ddad87e5ec6338a74c340485fed583107709acf
 2015-11-16 14:46:29 +09:00
Sungsoo Lim
5482d342cd Prevent NPE in MediaSessionService 
Guard against null UserRecord when dispatching a media key event.

Bug: 22966229
Change-Id: I32f4f87e06d8af13b94bb8f28180a66517c23c33
 2015-11-16 14:06:01 +09:00