Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
313,251 Commits 3 Branches 0 Tags
360bde1e8552912897ffbc01fcb3bf24696d2932
Commit Graph

313251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
360bde1e85 Merge "Check for null when updating header" into oc-dev 
am: 010484f7c3

Change-Id: I902a5339f0d62ff14e2f9aa43eae7036d98c45e1
 2017-04-05 21:35:05 +00:00
Sundeep Ghuman
44132cec43 Merge "Create Espresso test for WifiSettings." into oc-dev 
am: 0d47527058

Change-Id: I3691a2b57b36fc42f706f537e5274c59bb1c403d
 2017-04-05 21:33:31 +00:00
Jorim Jaggi
010484f7c3 Merge "Check for null when updating header" into oc-dev 2017-04-05 21:30:00 +00:00
TreeHugger Robot
0d47527058 Merge "Create Espresso test for WifiSettings." into oc-dev 2017-04-05 21:27:40 +00:00
Tobias Thierer
8283da42a4 Merge "Document the fact that StatFs.restat() and ctor can throw." am: 183c93f6a0 am: e11ed001dd 
am: a426851da0

Change-Id: Ife49443ed8e5e4e90723e4e46c0e8c48a6ee5547
 2017-04-05 21:14:46 +00:00
Tobias Thierer
a426851da0 Merge "Document the fact that StatFs.restat() and ctor can throw." am: 183c93f6a0 
am: e11ed001dd

Change-Id: Ia2ee1c65e6cd7992d0761a7eeb6e9bb7964de3bc
 2017-04-05 21:09:14 +00:00
Tobias Thierer
e11ed001dd Merge "Document the fact that StatFs.restat() and ctor can throw." 
am: 183c93f6a0

Change-Id: I0c8a4c12495260044be6aac74a505280498a9b44
 2017-04-05 21:03:42 +00:00
Tobias Thierer
183c93f6a0 Merge "Document the fact that StatFs.restat() and ctor can throw." 2017-04-05 20:53:47 +00:00
Tenghui Zhu
a5485359c9 Merge "Make sure we handle the matrix separately for non-invertable matrix" into oc-dev 
am: 399dba4ab0

Change-Id: I9ff2b46f5b06f5092e4aaca348aa021f870c7c6f
 2017-04-05 20:52:32 +00:00
Tobias Thierer
0ad48dc8aa Document the fact that StatFs.restat() and ctor can throw. 
StatFs.restat() and the StatFs constructor can throw
IllegalArgumentException. This was not previously documented;
not all callers took this into account, for example:
   http://r.android.com/251290

This CL adds documentation to those methods. It also adds
comments to two of the callers.

Separately from this CL, we may in addition consider adding
new API StatFs.checkedRestat() and StatFs.checkedCreate()
or similar that throw IOException; we cannot change the
existing constructor and method since they are public.

Test: Checked that "make" still completed successfully.

Change-Id: I6a0b3cb7718939408937c61de7c3b000b948fa59
 2017-04-05 20:52:04 +00:00
Christopher Tate
9e8672a482 Merge "Allow background default container service in a less crashy way" into oc-dev 
am: 0283544c49

Change-Id: I863c9c8ae1d3760eb68d7169b8d60260731d6190
 2017-04-05 20:51:16 +00:00
Adam Lesinski
557f8f72c8 Merge "AAPT2: Fix pseudolocalization (again)" into oc-dev 
am: 448727bdae

Change-Id: I7cb95f9fa3a92ad342a807660e8a415ca9f4fe41
 2017-04-05 20:50:14 +00:00
Adam Lesinski
9f887687fd Merge "Fix NPE when adding WebView to ResourcesManager" into oc-dev 
am: 7e5205137c

Change-Id: Ifb45086ba1c53e4de5abe83de66118e026c3c297
 2017-04-05 20:49:06 +00:00
Dianne Hackborn
6011f7c74d Merge "Work on issue #36869295: com.qti.qualcomm.datastatusnotification..." into oc-dev 
am: 36de376430

Change-Id: I96f6f541d2cf285d593f82ad548057a4873ae958
 2017-04-05 20:47:54 +00:00
Dianne Hackborn
ec5feb873e Merge "Deliver start service args with ParcelledListSlice." into oc-dev 
am: 1cf2c97459

Change-Id: Iacdd90c6081e93e38cfe932f5210545f33562f7a
 2017-04-05 20:46:48 +00:00
Tenghui Zhu
399dba4ab0 Merge "Make sure we handle the matrix separately for non-invertable matrix" into oc-dev 2017-04-05 20:44:36 +00:00
TreeHugger Robot
0283544c49 Merge "Allow background default container service in a less crashy way" into oc-dev 2017-04-05 20:43:42 +00:00
TreeHugger Robot
448727bdae Merge "AAPT2: Fix pseudolocalization (again)" into oc-dev 2017-04-05 20:43:23 +00:00
TreeHugger Robot
7e5205137c Merge "Fix NPE when adding WebView to ResourcesManager" into oc-dev 2017-04-05 20:42:01 +00:00
TreeHugger Robot
36de376430 Merge "Work on issue #36869295: com.qti.qualcomm.datastatusnotification..." into oc-dev 2017-04-05 20:40:57 +00:00
Dianne Hackborn
2f8e3788f3 Work on issue #36869295: com.qti.qualcomm.datastatusnotification... 
...is not Bg Check compliant

Make the exception message include the state of the app's
UidRecord to help debug what is going on.

Test: boot and ran

Change-Id: Ie829265c7979ccabf8bae0bc6521bd9a7357d77f
 2017-04-05 13:39:40 -07:00
Dianne Hackborn
1cf2c97459 Merge "Deliver start service args with ParcelledListSlice." into oc-dev 2017-04-05 20:37:36 +00:00
Adrian Roos
3a1776794a Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev 
am: debabde073

Change-Id: I9550d91619d544d80dae1de51412527733a18e80
 2017-04-05 20:36:49 +00:00
Felipe Leme
dae23dab8c Merge "Removed deprecated auto(F)ill classes." into oc-dev 
am: b44feb154b

Change-Id: I95768d5e62af9f9fd6469b8a8e36c6e6a196091a
 2017-04-05 20:32:10 +00:00
TreeHugger Robot
debabde073 Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev 
* changes:
  NotificationViewWrapper: Fix crash for custom views
  Revert "Revert "AOD: Use color filter to invert icons for AOD""
  Revert "Revert "NotificationWrappers: Factor out doze treatment""
  AOD: prevent clicking shelf when dark
 2017-04-05 20:30:20 +00:00
Dmitry Dementyev
7e9c81f3ad Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev 
am: 8c9f966eab

Change-Id: I96d92e870a377ac0c5b6a08d4f1affc01fa07396
 2017-04-05 20:26:05 +00:00
TreeHugger Robot
b44feb154b Merge "Removed deprecated auto(F)ill classes." into oc-dev 2017-04-05 20:25:40 +00:00
TreeHugger Robot
8c9f966eab Merge "Clear calling identity before getUserAccounts in AccountManagerService" into oc-dev 2017-04-05 20:18:43 +00:00
Rubin Xu
b9b4825c8b Merge "Tweak javadoc of setResetPasswordToken" into oc-dev 
am: ae23290ef5

Change-Id: Ib8988c2c0c07aba71fe995a64c7bb7d8fe504141
 2017-04-05 20:07:18 +00:00
Daniel Nishi
20ea785a18 Merge "Add storage fullness methods to volume provider." into oc-dev 
am: 4566fd3abc

Change-Id: I8183ebd7dedf01767b046863e6e7ba1e550a9b08
 2017-04-05 20:05:45 +00:00
TreeHugger Robot
ae23290ef5 Merge "Tweak javadoc of setResetPasswordToken" into oc-dev 2017-04-05 20:02:04 +00:00
Daniel Nishi
4566fd3abc Merge "Add storage fullness methods to volume provider." into oc-dev 2017-04-05 19:59:16 +00:00
Kang Li
e9b280bbec Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev 
am: b24399547c

Change-Id: I45e96d0b5e88eb280e6dbc5981e6a6a7f1a4b6e2
 2017-04-05 19:57:08 +00:00
Kang Li
b24399547c Merge "Revert "Add a service to rank apps for ResolverActivity."" into oc-dev 2017-04-05 19:50:10 +00:00
Kang Li
c88749fb5a Revert "Add a service to rank apps for ResolverActivity." 
This reverts commit 90370e0b24.

b: 36952725

Change-Id: Ifa8f182c707cdbbc989b1f61630f7a8fa856d32d
 2017-04-05 19:44:02 +00:00
Hall Liu
5d810f47da Merge "Query geo description in worker thread to prevent ANR" am: eb7c287c71 am: 53d241411a 
am: b0e36dec89

Change-Id: Idf51f20246e2bd91dcc0b65ec2102b788d9e10fe
 2017-04-05 19:43:39 +00:00
Hall Liu
b0e36dec89 Merge "Query geo description in worker thread to prevent ANR" am: eb7c287c71 
am: 53d241411a

Change-Id: If224f142cf1bb77ecf8ed515250ad5c813682eb0
 2017-04-05 19:38:07 +00:00
Todd Kennedy
057e80d21c Merge "look for old intent values" into oc-dev 
am: 1aade4e4a1

Change-Id: I3c5d202886862de4b631e23fffb357613998ac6b
 2017-04-05 19:38:04 +00:00
Todd Kennedy
1aade4e4a1 Merge "look for old intent values" into oc-dev 2017-04-05 19:32:27 +00:00
Hall Liu
53d241411a Merge "Query geo description in worker thread to prevent ANR" 
am: eb7c287c71

Change-Id: I0df6d788ff5f8794e03324c3dacf337a7a04c36c
 2017-04-05 19:32:07 +00:00
Hall Liu
eb7c287c71 Merge "Query geo description in worker thread to prevent ANR" 2017-04-05 19:23:32 +00:00
Tyler Gunn
a268c370dc Merge "Add api to retrieve call creation time." into oc-dev 
am: c85aa306c1

Change-Id: Ie3601acb589852a850d41336cad0ffe52f88ca4d
 2017-04-05 18:36:44 +00:00
TreeHugger Robot
c85aa306c1 Merge "Add api to retrieve call creation time." into oc-dev 2017-04-05 18:29:22 +00:00
Adrian Roos
7c68e29171 NotificationViewWrapper: Fix crash for custom views 
Bug: 36430936
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java
Change-Id: Ibdf9cf90fcb69a8af8a3b60596143e3be83fe46e
Merged-In: Ibdf9cf90fcb69a8af8a3b60596143e3be83fe46e
 2017-04-05 11:24:42 -07:00
Dmitry Dementyev
5c80debe86 Clear calling identity before getUserAccounts in 
AccountManagerService

Fix accountsDb tests.

Bug: 36860606
Test: manual
Change-Id: Iad86d1bf7edd0f847262562ace9c2d5c9fdff978
(cherry picked from commit 9fc6f574b4)
 2017-04-05 18:24:42 +00:00
Adrian Roos
456e005a6d Revert "Revert "AOD: Use color filter to invert icons for AOD"" 
This reverts commit 30d9bad767.

Change-Id: I3a6dd476cb90074d012a05bb291eeaf441fe20d3
Merged-In: I3a6dd476cb90074d012a05bb291eeaf441fe20d3
 2017-04-05 11:24:34 -07:00
Adrian Roos
7bcf6d378f Revert "Revert "NotificationWrappers: Factor out doze treatment"" 
This reverts commit 934027a430.

Change-Id: Id4008fc79e474f3820f3587dff40720a57c9ef3a
Merged-In: Id4008fc79e474f3820f3587dff40720a57c9ef3a
 2017-04-05 11:23:34 -07:00
Adrian Roos
03cf2586fa AOD: prevent clicking shelf when dark 
Fixes: 35718464
Test: Enable AOD, try clicking on shelf in AOD, make sure it's not clickable.
Change-Id: Iede88d1e0ab394f0db2acaac6a1ad8baaeef15f1
 2017-04-05 11:23:21 -07:00
Rubin Xu
f7b036db0b Tweak javadoc of setResetPasswordToken 
Bug: 34600579
Test: make -j32 docs
Change-Id: Ib4593c20fb78f52d5e75cafdfea32d747cc340c9
 2017-04-05 19:17:48 +01:00
Bryce Lee
2885540579 Merge "Do not try to restore a task id if it does not exist." into oc-dev 
am: 081d2ccd52

Change-Id: I2e5109329275a12ef7ce5aa550de8ef8f56ad807
 2017-04-05 18:08:33 +00:00