Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
236,949 Commits 3 Branches 0 Tags
b562aaaa4c484682d5ae46ebfed04062fa7e13c2
Commit Graph

236949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Micay
b562aaaa4c Merge "fix SeekBarPreference support for summaries" 
am: 06ce16a54c

* commit '06ce16a54c971e922d9e34cc5a57f012614db20f':
  fix SeekBarPreference support for summaries
 2016-03-10 15:33:51 +00:00
Alan Viverette
06ce16a54c Merge "fix SeekBarPreference support for summaries" 2016-03-10 15:24:14 +00:00
Michal Karpinski
ebcd9c8dae Tuning down wtf to warning for setting ro.device_owner property 
am: 2f79ae98af

* commit '2f79ae98afd895ec1179b38fccb538f64164b9fd':
  Tuning down wtf to warning for setting ro.device_owner property
 2016-03-10 15:06:22 +00:00
Michal Karpinski
2f79ae98af Tuning down wtf to warning for setting ro.device_owner property 
This was logged to often, especially while running CTS hostside tests
and looked too scary to people.

Bug: 27230864
Change-Id: I9e81d9efe87b4aed18aa473be647c560ff9cfa0d
 2016-03-10 15:00:08 +00:00
Anton Daubert
2db4ef3a6a Merge "Fine scale the decoded result to match the desired sampleSize." into nyc-dev 
am: cb1b27b6f8

* commit 'cb1b27b6f8e728f12a2e8a5c172aa249440d611f':
  Fine scale the decoded result to match the desired sampleSize.
 2016-03-10 12:11:54 +00:00
Anton Daubert
cb1b27b6f8 Merge "Fine scale the decoded result to match the desired sampleSize." into nyc-dev 2016-03-10 12:06:29 +00:00
Jaesung Chung
20f5cd3fcc Merge "ExifInterface: implement the serialzation for Exif IFD structures" into nyc-dev 
am: 89cb194542

* commit '89cb1945424f1d4c7278d24cd09f0a8d09093883':
  ExifInterface: implement the serialzation for Exif IFD structures
 2016-03-10 08:39:07 +00:00
Jaesung Chung
89cb194542 Merge "ExifInterface: implement the serialzation for Exif IFD structures" into nyc-dev 2016-03-10 08:35:24 +00:00
Jaesung Chung
86e552b9fa ExifInterface: implement the serialzation for Exif IFD structures 
One image can have multiple image file directories, which stores the
attributes of the image, in Exif specification to save metadata.
In the old version, the all attributes from several image file
directories were combined in a one hash map eventually and were served
without distinction of the original IFD group.

In order to keep the original data as much as possible, it loads/saves
the attributes based on the original IFD group internally.

Bug: 26044456, Bug: 11224701
Change-Id: I416e4e79fd47461c9aa83ce13591ed1a5d42f26e
 2016-03-10 15:51:41 +09:00
Roozbeh Pournader
337ebb3206 Merge "Annotate fonts.xml with intended scripts" into nyc-dev 
am: 349dc61cba

* commit '349dc61cbaf6876184f659695896158f4991f04d':
  Annotate fonts.xml with intended scripts
 2016-03-10 06:44:26 +00:00
Roozbeh Pournader
349dc61cba Merge "Annotate fonts.xml with intended scripts" into nyc-dev 2016-03-10 06:38:55 +00:00
Roozbeh Pournader
9bd17ce738 Annotate fonts.xml with intended scripts 
Add various ISO 15924 codes to fonts.xml, as a signal for better
font selection in Minikin.

Bug: 27582800
Bug: 26187231
Change-Id: Ie06c156e0179e79c15cf2d66d577c3d36571860d
 2016-03-09 21:46:15 -08:00
Adam Lesinski
d949f59be5 Merge "AssetManager: Cache a pre-filtered list of configurations" into nyc-dev 
am: 960b9441cf

* commit '960b9441cfcee7f214b1733641da58ff4292eda1':
  AssetManager: Cache a pre-filtered list of configurations
 2016-03-10 05:11:50 +00:00
Adam Lesinski
960b9441cf Merge "AssetManager: Cache a pre-filtered list of configurations" into nyc-dev 2016-03-10 05:05:15 +00:00
Jaesung Chung
7f5a0fba66 Merge "ExifInterface: fix a bug in readExifEntryValue" into nyc-dev 
am: e834dd78d4

* commit 'e834dd78d4bcc7667429236d37f7b875c23c640c':
  ExifInterface: fix a bug in readExifEntryValue
 2016-03-10 04:30:52 +00:00
Jaesung Chung
e834dd78d4 Merge "ExifInterface: fix a bug in readExifEntryValue" into nyc-dev 2016-03-10 04:26:52 +00:00
Daniel Micay
084ee67b35 fix SeekBarPreference support for summaries 
Overriding getSummary breaks support for summaries even though it's
supported in the layout for SeekBarPreference. If there's no summary the
return value is already null in the inherited implementation.

Change-Id: I2e72ea3c4a624acbf200e9617173eb072572fa57
 2016-03-09 21:50:30 -05:00
Lorenzo Colitti
69b05095cc Merge "Don\'t crash if we get a DHCP packet with the wrong port." 
am: c3cc890380

* commit 'c3cc89038075916c4dd5ba62899e4520477435d4':
  Don't crash if we get a DHCP packet with the wrong port.
 2016-03-10 02:45:21 +00:00
Md Haque
ad1c93dd94 Merge "Fix Download Manager Functional test and enable for APCT" into nyc-dev 
am: cf4c7f58b0

* commit 'cf4c7f58b068ec1021dcd1dd7b52167ecb2247d0':
  Fix Download Manager Functional test and enable for APCT
 2016-03-10 02:38:48 +00:00
Winson
24abe69de3 Merge "Fix regression when setting initial offset when docked." into nyc-dev 
am: d2130267a7

* commit 'd2130267a77c968c6f5384298fcfdb85daa0763a':
  Fix regression when setting initial offset when docked.
 2016-03-10 02:38:47 +00:00
Md Haque
cf4c7f58b0 Merge "Fix Download Manager Functional test and enable for APCT" into nyc-dev 2016-03-10 02:32:55 +00:00
Winson Chung
d2130267a7 Merge "Fix regression when setting initial offset when docked." into nyc-dev 2016-03-10 02:32:16 +00:00
Winson
809a5b128d Fix regression when setting initial offset when docked. 
Change-Id: Ide8e9eb2d97b5540186736fc73b093e4385613bd
 2016-03-09 18:30:32 -08:00
Lorenzo Colitti
c3cc890380 Merge "Don't crash if we get a DHCP packet with the wrong port." 2016-03-10 02:29:09 +00:00
Hyunyoung Song
c742752735 Merge "Revert "Apply transformations while offsetting focused rects"" into nyc-dev 
am: ef33726e14

* commit 'ef33726e1439adeb408b0ca44f0ee55042dad26d':
  Revert "Apply transformations while offsetting focused rects"
 2016-03-10 02:28:28 +00:00
Winson
a85c849a9f Merge "Fixing issue with animations not being cancelled." into nyc-dev 
am: 44ffd922dc

* commit '44ffd922dc61e0855026763b8d53453f0a1eda17':
  Fixing issue with animations not being cancelled.
 2016-03-10 02:24:37 +00:00
Hyunyoung Song
ef33726e14 Merge "Revert "Apply transformations while offsetting focused rects"" into nyc-dev 2016-03-10 02:22:58 +00:00
Winson Chung
44ffd922dc Merge "Fixing issue with animations not being cancelled." into nyc-dev 2016-03-10 02:21:06 +00:00
Winson
73492c5d7a Fixing issue with animations not being cancelled. 
Bug: 27533931
Change-Id: I724643ec8a2c6cdaa3cade72ae40abcf9d28bae5
 2016-03-09 18:20:15 -08:00
Hyunyoung Song
4eb1a4e003 Revert "Apply transformations while offsetting focused rects" 
b/27335262

This reverts commit 83e725da7a.

Change-Id: I55079bbaab81610e9de3a8d68ed21cf352da5983
 2016-03-10 02:19:14 +00:00
Dianne Hackborn
1f786e4bcd Merge "DO NOT MERGE: Add separate information about user whitelist." into nyc-dev 
am: 839ff816a5

* commit '839ff816a516a6eb806aee2cef681ad3b3c14b56':
  DO NOT MERGE: Add separate information about user whitelist.
 2016-03-10 01:53:05 +00:00
Dianne Hackborn
839ff816a5 Merge "DO NOT MERGE: Add separate information about user whitelist." into nyc-dev 2016-03-10 01:46:03 +00:00
Dianne Hackborn
262ae5c8eb DO NOT MERGE: Add separate information about user whitelist. 
Use this in the alarm manager to allow user whitelisted apps
to have free access to scheduling alarms.

Coming next: lifting sync/job restrictions.

Bug #26851107: Allow user whitelist apps more freedom

(Cherry-picked to nyc since it got lost in the branch from master.)

Change-Id: I4dc9f07514627ebdb6b6eff7c7a749f2c51a3797
 2016-03-09 17:39:40 -08:00
Daichi Hirono
e3c06e166c Merge "Skip MTP launch notification for devices having FEATURE_AUTOMOTIVE." into nyc-dev 
am: 05133ad090

* commit '05133ad090135f41a1cd347dbf41c4cc029e6f9b':
  Skip MTP launch notification for devices having FEATURE_AUTOMOTIVE.
 2016-03-10 01:39:15 +00:00
Daichi Hirono
05133ad090 Merge "Skip MTP launch notification for devices having FEATURE_AUTOMOTIVE." into nyc-dev 2016-03-10 01:35:28 +00:00
Adam Lesinski
ff5808d223 AssetManager: Cache a pre-filtered list of configurations 
When we set the parameters for a ResTable, we can pre-filter which
resources match and only look at that smaller list when getting entries.
This helps A LOT with types that have many configurations, like strings
and all their various locales.

We must store the cached entries in a parallel data structure because parts
of the main Type object are shared with other ResTables, causing data races.

Bug:25499111
Change-Id: I63e37dcbd683fc9f1e7d0f3a6ed4c1c01e0fc575
 2016-03-09 17:33:14 -08:00
Sudheer Shanka
05be04ed88 Merge "Fix description for the string disabled_by_admin." into nyc-dev 
am: 0dd17c8406

* commit '0dd17c840645e6d1fd67276b45420ca742df6110':
  Fix description for the string disabled_by_admin.
 2016-03-10 01:13:37 +00:00
Jaewan Kim
5a076f424e Merge "PIP: Prepare PIP strings for translations" into nyc-dev 
am: fd27ae9611

* commit 'fd27ae961197d03f2e24dd88d2e94dadefad896a':
  PIP: Prepare PIP strings for translations
 2016-03-10 01:05:41 +00:00
Jaewan Kim
9f624deb42 Merge "PIP: Close PIP if media session is gone" into nyc-dev 
am: 1ea8722f93

* commit '1ea8722f933b761ef791813968ff0cc202a2f8b9':
  PIP: Close PIP if media session is gone
 2016-03-10 01:05:40 +00:00
Sudheer Shanka
0dd17c8406 Merge "Fix description for the string disabled_by_admin." into nyc-dev 2016-03-10 01:05:37 +00:00
Sudheer Shanka
535b4e7eac Fix description for the string disabled_by_admin. 
Change-Id: I229891fd6796521fc0b84f5ae5463b8697cf0934
 2016-03-09 17:04:15 -08:00
Joe Onorato
af2d5fb699 Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev 
am: 04a72a2a51

* commit '04a72a2a51ce3d128959b2ba53b5c22576322e59':
  Add an API for apps to get their System Health / Battery Stats data.
 2016-03-10 00:58:30 +00:00
Jaewan Kim
fd27ae9611 Merge "PIP: Prepare PIP strings for translations" into nyc-dev 2016-03-10 00:58:09 +00:00
Jaewan Kim
1ea8722f93 Merge "PIP: Close PIP if media session is gone" into nyc-dev 2016-03-10 00:57:26 +00:00
Jaewan Kim
f40fcdca2c PIP: Close PIP if media session is gone 
This keeps the PIP if there's no media session from the beginning.

Bug: 26717072
Change-Id: Idf5bab14d8979c0e50f4451f61bb9355d4562b96
 2016-03-10 09:54:37 +09:00
Joe Onorato
04a72a2a51 Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev 2016-03-10 00:52:03 +00:00
Adam Lesinski
45527c3d17 Merge "AAPT2: Fix file::mkdirs when given absolute paths" into nyc-dev 
am: d96ce2675f

* commit 'd96ce2675f6b7156bd63f7b328dc33741e186723':
  AAPT2: Fix file::mkdirs when given absolute paths
 2016-03-10 00:45:22 +00:00
Tomasz Mikolajewski
c33c28dd54 Merge "Improve sorting performance by 2.5 times." into nyc-dev 
am: 9ab36aa86e

* commit '9ab36aa86e0cf03f6f64896ded9e155a40bfd486':
  Improve sorting performance by 2.5 times.
 2016-03-10 00:36:25 +00:00
Adam Lesinski
d96ce2675f Merge "AAPT2: Fix file::mkdirs when given absolute paths" into nyc-dev 2016-03-10 00:32:35 +00:00
Chris Craik
05122f0d46 Merge "Partial revert of 261725fdb2962271c222a049fcdf57bbdc8363c7" into nyc-dev 
am: 727819d134

* commit '727819d134f9e8192c2c952f10adcc12191cd079':
  Partial revert of 261725fdb2
 2016-03-10 00:32:06 +00:00