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

244889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
a83e5e0de5 Import translations. DO NOT MERGE 
Change-Id: I0e5fc6091ad0aef04c9eb12ee018c9db572b43f4
Auto-generated-cl: translation import
 2016-04-09 05:44:17 -07:00
Doris Liu
f26298f8ae resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp 
am: 9d5c93f

* commit '9d5c93f40758636fea18616cf915d49eca67d7b0':
  Improve error logging for parsing failures

Change-Id: I1a0a30961f939b9023480d2f3de36665ad8afab9
 2016-04-08 20:48:35 +00:00
Doris Liu
9d5c93f407 resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp 
Change-Id: Ifa9dea0e4a0337c24dad899a10b5def46679742c
 2016-04-08 13:31:42 -07:00
Etan Cohen
433c5848cf [NAN] Add type and nullability annotations. Update hide annotation. 
am: d775a16

* commit 'd775a164c37294ee97f902792aa75da41d3ccf82':
  [NAN] Add type and nullability annotations. Update hide annotation.

Change-Id: Ied809f8825ee49f50dd0108c2cdbeb328bd35aef
 2016-04-08 18:50:15 +00:00
Selim Gurun
014b19c30e Merge "Corrections to processing abioverride flag" into nyc-dev am: cea7321 
am: 230aa1c

* commit '230aa1ce481ae290aea9f3786d2f6909d0db05bc':
  Corrections to processing abioverride flag

Change-Id: I351ce8c751ca5b61ef9054b26957b636ce627883
 2016-04-08 18:17:21 +00:00
Paul Lawrence
56c682d7c1 Merge "Add setting and detection of ro.sys.safemode property." into nyc-dev am: c0a8fa8 
am: 8aa6242

* commit '8aa6242cb547806bdbff4e7e873bde1d563f40ab':
  Add setting and detection of ro.sys.safemode property.

Change-Id: I640b31ccd802f6c1cec57e24f913d3757ebbd804
 2016-04-08 18:08:34 +00:00
Selim Gurun
230aa1ce48 Merge "Corrections to processing abioverride flag" into nyc-dev 
am: cea7321

* commit 'cea732185fd1b8560a3732116b6092975c254437':
  Corrections to processing abioverride flag

Change-Id: I14d7d687e3fa15d1cfe2a71e9adf9f9c6bea16ec
 2016-04-08 18:07:48 +00:00
Doris Liu
0e89f98044 Merge "Improve error logging for parsing failures" into nyc-dev 2016-04-08 18:02:51 +00:00
Doris Liu
0a1a5167be Improve error logging for parsing failures 
Bug: 27043594
Change-Id: I901b65f734c49444a78e0714e007e15e2340ab9d
 2016-04-08 18:01:54 +00:00
Selim Gurun
cea732185f Merge "Corrections to processing abioverride flag" into nyc-dev 2016-04-08 17:57:58 +00:00
Chong Zhang
e1ba2fe72d Merge "Take screenshot of finishing apps as requested" into nyc-dev am: a1544dd 
am: 535ce3e

* commit '535ce3e59a23f52a467675045df8e8a843b93fd7':
  Take screenshot of finishing apps as requested

Change-Id: Ifb0add127a7cd71dc1043b12cbfe8fd1a1cdd6fc
 2016-04-08 17:54:10 +00:00
Anna Galusza
f158dbd728 Merge "Fix issue where (accessibility) keyboard mode callbacks were not always called. Bug: 28007101" into nyc-dev am: 21cafcd 
am: 0fcdfd4

* commit '0fcdfd47af29f1dead8c223a5d0cd81df82235d2':
  Fix issue where (accessibility) keyboard mode callbacks were not always called. Bug: 28007101

Change-Id: I99e75bb9bf27e5a7a86f9512b99bde8433e158de
 2016-04-08 17:54:08 +00:00
Jason Monk
583997c923 Merge "Add constant for premium sms screen" into nyc-dev am: 06112bb 
am: 56f9f9b

* commit '56f9f9bb08af4a7a07e0dd3c082244862c7ee4b2':
  Add constant for premium sms screen

Change-Id: Ifa6916308703bed7a797985c49977ca47ce0e7fa
 2016-04-08 17:54:05 +00:00
dcashman
8aa6242cb5 Merge "Add setting and detection of ro.sys.safemode property." into nyc-dev 
am: c0a8fa8

* commit 'c0a8fa89180e4d7582ecb723b579d253f297901c':
  Add setting and detection of ro.sys.safemode property.

Change-Id: I564614108ec0fa33a9e12952fc8ec3e874264adf
 2016-04-08 17:53:24 +00:00
Chong Zhang
535ce3e59a Merge "Take screenshot of finishing apps as requested" into nyc-dev 
am: a1544dd

* commit 'a1544dd61457144969163d194c10d75bd7d251a9':
  Take screenshot of finishing apps as requested

Change-Id: I318621d272c5eb48a6ab96e0255bff20a9909866
 2016-04-08 17:46:06 +00:00
Paul Lawrence
c0a8fa8918 Merge "Add setting and detection of ro.sys.safemode property." into nyc-dev 2016-04-08 17:40:42 +00:00
Chong Zhang
a1544dd614 Merge "Take screenshot of finishing apps as requested" into nyc-dev 2016-04-08 17:36:31 +00:00
Etan Cohen
d58e6cf14b [NAN] Add master switch to enable/disable usage of NAN APIs. 
am: d3137af

* commit 'd3137af10291ff888125de747d9ee05f73f3fd8e':
  [NAN] Add master switch to enable/disable usage of NAN APIs.

Change-Id: Iea1d3cf5eca777449898c571d58db33c59ffd0c2
 2016-04-08 17:30:41 +00:00
dcashman
f44f5a460e Add setting and detection of ro.sys.safemode property. 
Bug: 28008032
Change-Id: I6b19b32df615becd88a56a337c999b57011c6200
 2016-04-08 10:20:01 -07:00
Etan Cohen
d775a164c3 [NAN] Add type and nullability annotations. Update hide annotation. 
Additional annotations on (what are planned to be) public APIs.
Fixed exposed API: @hide to a few new methods.

Bug: 27122760
Change-Id: Iea91de1b1c3c32a93378b5d90c1e88d994a10526
 2016-04-08 10:18:37 -07:00
Etan Cohen
d3137af102 [NAN] Add master switch to enable/disable usage of NAN APIs. 
Add master switch to enable/disable usage of NAN. Tie into Wi-Fi
state machine (to enable/disable based on Wi-Fi enable/disable).
Dispatch broadcasts when NAN status changes.

Bug: 27698011
Change-Id: Iea36388443ff8d0dc26a280220022c6bdba6a0c8
 2016-04-08 10:18:37 -07:00
Anna Galusza
0fcdfd47af Merge "Fix issue where (accessibility) keyboard mode callbacks were not always called. Bug: 28007101" into nyc-dev 
am: 21cafcd

* commit '21cafcd6628a36f844dee850dc653913bc3ef832':
  Fix issue where (accessibility) keyboard mode callbacks were not always called. Bug: 28007101

Change-Id: I658f48e51d0f9e599f6aeb15b76fd9db3abe0649
 2016-04-08 17:18:24 +00:00
Jason Monk
56f9f9bb08 Merge "Add constant for premium sms screen" into nyc-dev 
am: 06112bb

* commit '06112bb2df348614b48ae6586cc70be0bfd42adc':
  Add constant for premium sms screen

Change-Id: Id3e629ba961473a56dcad4380d80957df819d8cd
 2016-04-08 17:18:22 +00:00
Bennie Ouyang
afb749fcd7 Merge "Added Notification Stress Tests" into nyc-dev am: fc90ffe 
am: b45b0b7

* commit 'b45b0b71058053dd7fd00f47ad92a430b48b29fb':
  Added Notification Stress Tests

Change-Id: I16ac8abe9f5b4c3c6431e24d807f9b8fb23ab6d3
 2016-04-08 17:13:36 +00:00
Bennie Ouyang
b45b0b7105 Merge "Added Notification Stress Tests" into nyc-dev 
am: fc90ffe

* commit 'fc90ffe392c3f00d85998e778e5b0bcd5240ce93':
  Added Notification Stress Tests

Change-Id: I66b8ae96b0f6aa02ee228f2d85b52fe3cb1ac148
 2016-04-08 17:08:08 +00:00
Anna Galusza
21cafcd662 Merge "Fix issue where (accessibility) keyboard mode callbacks were not always called. Bug: 28007101" into nyc-dev 2016-04-08 17:06:10 +00:00
Jason Monk
06112bb2df Merge "Add constant for premium sms screen" into nyc-dev 2016-04-08 17:04:45 +00:00
Bennie Ouyang
fc90ffe392 Merge "Added Notification Stress Tests" into nyc-dev 2016-04-08 16:58:21 +00:00
Raph Levien
34ea6b68de Merge "Avoid copying of font table data, provide raw font bytes" into nyc-dev am: c147dbb 
am: eadd2b8

* commit 'eadd2b8aba89ebab859149c25779127bd755ace9':
  Avoid copying of font table data, provide raw font bytes

Change-Id: If2a32510f97d15924970e31454f805757745a9fc
 2016-04-08 16:55:22 +00:00
Raph Levien
eadd2b8aba Merge "Avoid copying of font table data, provide raw font bytes" into nyc-dev 
am: c147dbb

* commit 'c147dbbca4ea1870bcf88c5889e6a83865ceed54':
  Avoid copying of font table data, provide raw font bytes

Change-Id: Icf7e1aa1bc8ae759aaff94a3eeea7261a5456b47
 2016-04-08 16:48:25 +00:00
Svetoslav Ganov
aaa7595198 Merge "Fix a NPE in PackageInstallerService" into nyc-dev am: 0e868a1 
am: 960659a

* commit '960659a4495f6c14ff1a9f55a30b75b3c9862ab5':
  Fix a NPE in PackageInstallerService

Change-Id: I1ef50d7c1acbf9013ba1c95514c350f05433943a
 2016-04-08 16:40:22 +00:00
Svet Ganov
960659a449 Merge "Fix a NPE in PackageInstallerService" into nyc-dev 
am: 0e868a1

* commit '0e868a193e926d799c0a53b071d05cda4b0e59ed':
  Fix a NPE in PackageInstallerService

Change-Id: Iac6e278ce4052bd01e3a4aa3db02f72665c6e198
 2016-04-08 16:34:39 +00:00
Raph Levien
c147dbbca4 Merge "Avoid copying of font table data, provide raw font bytes" into nyc-dev 2016-04-08 16:32:14 +00:00
Svetoslav Ganov
0e868a193e Merge "Fix a NPE in PackageInstallerService" into nyc-dev 2016-04-08 16:25:01 +00:00
Svet Ganov
3baa87653e Fix a NPE in PackageInstallerService 
bug:28051747

Change-Id: Ic38786e1ab4b4f6d0f9b1782d3bb46af04c61aa7
 2016-04-08 09:22:57 -07:00
Daniel U
abf8f16704 Merge "Copy lockscreen notification settings upon upgrade" into nyc-dev am: 534537d 
am: ee6b95a

* commit 'ee6b95a226a1414588eb8a06468eb0cd8017985b':
  Copy lockscreen notification settings upon upgrade

Change-Id: I39ed39f2ebf8d1ce39cdd68447f832c82d5e1f28
 2016-04-08 16:00:30 +00:00
Daniel U
ee6b95a226 Merge "Copy lockscreen notification settings upon upgrade" into nyc-dev 
am: 534537d

* commit '534537d313fdf456979aaf7cdbabc63c718e1d44':
  Copy lockscreen notification settings upon upgrade

Change-Id: I920dd5b11c52de96ebac3cd42109ef1ed9cbf9f8
 2016-04-08 15:56:09 +00:00
Evan Rosky
b3f63c70d5 Merge "Centralized user icon drawing with badges" into nyc-dev am: 289d8a0 
am: bd61907

* commit 'bd61907ba8364508cf0a8e5cd7d26827a53db83c':
  Centralized user icon drawing with badges

Change-Id: Ic6b26cf5329377c4cb4c7c29cd7d56cd3b58dc29
 2016-04-08 15:51:48 +00:00
Evan Rosky
bd61907ba8 Merge "Centralized user icon drawing with badges" into nyc-dev 
am: 289d8a0

* commit '289d8a08501125ef1bfb5cd49245df91519b0fe6':
  Centralized user icon drawing with badges

Change-Id: I9547131f6dadb2ca384e42df52cd135f9038f1ab
 2016-04-08 15:47:34 +00:00
Daniel U
534537d313 Merge "Copy lockscreen notification settings upon upgrade" into nyc-dev 2016-04-08 15:44:45 +00:00
Daniel U
02ba61203e Copy lockscreen notification settings upon upgrade 
Copy the primary values of LOCK_SCREEN_SHOW_NOTIFICATIONS and
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS into managed profile upon upgrade.

Bug:27673591
Change-Id: I3207b7e5bf844f0df534324220082edbdabe8444
 2016-04-08 16:41:15 +01:00
Evan Rosky
289d8a0850 Merge "Centralized user icon drawing with badges" into nyc-dev 2016-04-08 15:38:38 +00:00
Jason Monk
397df6875d Add constant for premium sms screen 
Bug: 27657256
Change-Id: Ia5b209deceb1726b62529c4144a85f5fc2d26833
 2016-04-08 11:37:34 -04:00
Raph Levien
296bf8c55a Avoid copying of font table data, provide raw font bytes 
Minikin is changing its approach to table access to use HarfBuzz to
access the tables, based on raw font data, rather than calling the
MinikinFont::GetTable() virtual method. This patch provides raw access
to the font data to make this work.

There's a bit of plumbing to make sure fonts get a pointer to the raw
data as well.

Bug: 27860101
Change-Id: I638e18cf363644bf22fbc9fb9b3358a9e731087f
 2016-04-08 08:29:32 -07:00
Etan Cohen
16d98f48f6 Merge "resolve merge conflicts of 65f4b14 to master" 2016-04-08 15:28:36 +00:00
Etan Cohen
47310a3e96 resolve merge conflicts of 65f4b14 to master 
Change-Id: I4eccf59d036e76ad5ed9a1ab870436d000bce8e0
 2016-04-08 08:26:59 -07:00
John Reck
7c2a570035 Merge "Make stopped state a first-class thing" into nyc-dev am: c724dcf 
am: 620a86e

* commit '620a86e464d585c796e51a16dad419d46d3837e4':
  Make stopped state a first-class thing

Change-Id: Idd258fd34c68ec214e41ceb90f1d911901535802
 2016-04-08 15:21:28 +00:00
John Reck
06cf0cb47a Merge "Fix a derp" into nyc-dev am: 4a73544 
am: 944e6b5

* commit '944e6b51b1ee5001f6eda258d247d2efd3ad4338':
  Fix a derp

Change-Id: I14c821a4e30f5f57f0aa71fba6a3e4a1bf980982
 2016-04-08 15:21:25 +00:00
John Reck
620a86e464 Merge "Make stopped state a first-class thing" into nyc-dev 
am: c724dcf

* commit 'c724dcf23c5e2ebd22c042a8a6f2424b7e9d5029':
  Make stopped state a first-class thing

Change-Id: Idfa3cc5d8fa5b07c742c2700b38441ff7d692f42
 2016-04-08 15:17:03 +00:00
John Reck
944e6b51b1 Merge "Fix a derp" into nyc-dev 
am: 4a73544

* commit '4a735441e82207e18036be09d0d02c855930938f':
  Fix a derp

Change-Id: I1975a6ed121ad0ddfc12784c45092c8af3823bdf
 2016-04-08 15:17:01 +00:00