Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
209,320 Commits 3 Branches 0 Tags
bfdaab5fdacc352ef0e937d15eafef4e406159bc
Commit Graph

2646 Commits

Author SHA1 Message Date
Jeff Sharkey
5b98249e67 am 5080e90a: am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit '5080e90a62445f3ddf2dcff4adabe2d251d25932':
  More info to support CTS, fix reconcile bug.
 2015-07-24 05:10:15 +00:00
Dianne Hackborn
96cc2b3050 am 1d8b0a29: am 14aca8e8: am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '1d8b0a29ab369cac21d9f3a643244dc8c6dec0c8':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 05:09:39 +00:00
Jeff Sharkey
5080e90a62 am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'aebcf3b7efadca1fb5eedbf2cf9f0895d93ba8e8':
  More info to support CTS, fix reconcile bug.
 2015-07-24 04:01:46 +00:00
Dianne Hackborn
1d8b0a29ab am 14aca8e8: am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '14aca8e87a3dc6e8fa783b3c45718a81f9f5e67a':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-24 04:01:24 +00:00
Jeff Sharkey
e87dc6dba5 am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev 
* commit 'f6e9a3ede53ae487838c19714ad62f25a4a6ca4c':
  More info to support CTS, fix reconcile bug.
 2015-07-23 19:18:25 +00:00
Dianne Hackborn
419f2177c8 am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 
* commit '6f64e737f046cd9ae13e260027781acfabaa4cba':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
 2015-07-23 19:18:10 +00:00
Jeff Sharkey
f6e9a3ede5 Merge "More info to support CTS, fix reconcile bug." into mnc-dev 2015-07-22 19:40:44 +00:00
Dianne Hackborn
6f64e737f0 Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 2015-07-22 19:04:00 +00:00
Jeff Sharkey
85ced63268 More info to support CTS, fix reconcile bug. 
Surface more details and commands for storage volumes to support
CTS testing.  Fix user reconciliation bug that skipped user setup on
empty volumes.

Bug: 22658804, 22633097
Change-Id: I4221312d1cce24d1f5a2c108095cf3cf471598ed
 2015-07-22 11:11:50 -07:00
Dianne Hackborn
451c3468b9 Fix issue #22612630: Ensure SMS/Call delivery during Doze 
Add whitelist timeout for SMS.

Change-Id: I3392093000ad177a93b6ef36fb18f0398a671423
 2015-07-21 17:39:46 -07:00
Fyodor Kupolov
a48c0304bf am cc432cc0: am 5211528b: am 67cd2fc5: am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit 'cc432cc08919cec386213f993b36bfdc5adf6ed0':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 21:49:41 +00:00
Fyodor Kupolov
cc432cc089 am 5211528b: am 67cd2fc5: am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit '5211528b9d1f51dca284d40e8d63dc3bc9527ac7':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 21:31:44 +00:00
Fyodor Kupolov
cf6500b9ba am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev 
* commit '55a116d00ca3f7b84a6af1c5c3472323ad5bc6ca':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
 2015-07-21 20:50:24 +00:00
Fyodor Kupolov
53019287fd Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction 
Bug: 21521860
Change-Id: I0c2659f84589a77432317fbc89d49716027577d3
 2015-07-21 12:06:14 -07:00
Xiaohui Chen
cfe64c8afa sys user split: update createUser method 
After the system user is split out, all users are more or less the same.
We combine the generic user and secondary user create method to reflect
this concept.  This also fixes the bug the newly created Primary user
from lock screen contains secondary user restrictions.

Bug: 19913735
Change-Id: Iff8802cd46401081bb444317becaf6ecab934e1e
 2015-07-17 09:47:13 -07:00
Xiaohui Chen
dbfb11a9f1 Merge "sys user split: refactor systemui user switcher" 2015-07-16 16:30:21 +00:00
Svetoslav
3e9079c978 am f25f3bd8: am 3c5fe9de: am 1f1f0cee: am eb16e1fb: am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit 'f25f3bd8718df8845c83f96e4f87d6dd3b974d0c':
  Make sure we get valid package name or fail.
 2015-07-16 00:22:02 +00:00
Svetoslav
f25f3bd871 am 3c5fe9de: am 1f1f0cee: am eb16e1fb: am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit '3c5fe9de7fdbab2db277b8136552d85e809f0d54':
  Make sure we get valid package name or fail.
 2015-07-16 00:05:12 +00:00
Svetoslav
eb16e1fb22 am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit '08dda27be4678f2ab5bdc7e210d511ec105c158c':
  Make sure we get valid package name or fail.
 2015-07-15 23:13:03 +00:00
Svetoslav
7395cbf070 Make sure we get valid package name or fail. 
bug:22492225

Change-Id: I7b7dce9a8e398c4615bcb700de80241e94c4320c
 2015-07-15 15:58:44 -07:00
Jim Miller
aa1a35ba27 am 2e56339a: am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit '2e56339a4a1133e9aface1c851f1ab67cff72109':
  Improve tracking of screen on reasons.
 2015-07-15 22:40:32 +00:00
Jim Miller
2e56339a4a am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit 'bcedcde8093b48c3d013cc57dde42bdd17d6dcb9':
  Improve tracking of screen on reasons.
 2015-07-15 22:26:05 +00:00
Jim Miller
c7b0435cc7 resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
 2015-07-15 14:33:10 -07:00
Dianne Hackborn
280a64e793 Improve tracking of screen on reasons. 
- New screen on app op to record the last time each app has
  caused the screen to be turned on.
- New battery stats event that tells us the reason the screen
  has been asked to turn on.
- Propagate out power manager API to specify the reason a caller
  is asking to have the screen turned on.

Note that currently the window flag to turn the screen on bypasses
much of this because it is being handled in the window manager by
just directly telling the power manager to turn the screen on.  To
make this better we need a new API where it can specify who it is
calling the API for.

Change-Id: I667e56cb1f80508d054da004db667efbcc22e971
 2015-07-15 09:59:07 -07:00
Dianne Hackborn
e0d96ce96c am 808dd5cc: am 4753b5bc: am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev 
* commit '808dd5cc8af3e26d12c1b5fe80663eb306cc0c20':
  Fix issue #21626564: MMS should be receivied while Dozing
 2015-07-15 02:37:04 +00:00
Dianne Hackborn
808dd5cc8a am 4753b5bc: am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev 
* commit '4753b5bcf4877e125a8e38d5bcd2ac46c1744429':
  Fix issue #21626564: MMS should be receivied while Dozing
 2015-07-15 02:21:54 +00:00
Dianne Hackborn
aa3694f2b3 am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev 
* commit 'f1f8b9cc3ff5774e695568e8f02b018c0fd02844':
  Fix issue #21626564: MMS should be receivied while Dozing
 2015-07-15 01:57:21 +00:00
Dianne Hackborn
fd854ee58c Fix issue #21626564: MMS should be receivied while Dozing 
We now place whoever is receiving the MMS on the temporary
whitelist while doing so, so they can get network access to
download it.

There was also an issue that needed to be fixed where we
were no longer updating the list of allowed uids while
dozing based on their proc states...  we now do that.

Also did a bit of optimization of the temp white list update
path do the network policy manager, instead of going through
a broadcast we now directly call in to the network policy
manager.  This also allows us to have a synchronous version
of updating the list, so we can know the app has network access
before we tell it to do anything.

Finally added battery stats events for things going on and off
the whitelist so we can diagnose the behavior there.

Change-Id: Ic7fe010af680034d9f8cb014bb135b2addef7455
 2015-07-14 18:33:08 -07:00
Jeff Sharkey
dc3e83eae3 am 026d6f97: am de404257: am 556136c8: am c7a60749: am d3719ab0: Merge "Better handling of storage paths." into mnc-dev 
* commit '026d6f97d120f7f557a50effd82e6b3b6f032870':
  Better handling of storage paths.
 2015-07-14 22:12:28 +00:00
Jeff Sharkey
026d6f97d1 am de404257: am 556136c8: am c7a60749: am d3719ab0: Merge "Better handling of storage paths." into mnc-dev 
* commit 'de404257a99d3a94b4d92923248af77817e447ed':
  Better handling of storage paths.
 2015-07-14 22:01:16 +00:00
Jeff Sharkey
c7a607496a am d3719ab0: Merge "Better handling of storage paths." into mnc-dev 
* commit 'd3719ab07a0ba66c019979ce19c45b77c4aae92e':
  Better handling of storage paths.
 2015-07-14 21:18:26 +00:00
Mathieu Chartier
f8cc20031e am 82f91da7: am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses" 
* commit '82f91da700445c4606faea45ac8f0dc9f2857471':
  Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
 2015-07-14 20:47:32 +00:00
Mathieu Chartier
82f91da700 am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses" 
* commit 'ad4a285af619ea29f79dbe4da19061c49f24a8c9':
  Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
 2015-07-14 20:27:42 +00:00
Adrian Roos
b483aebdd3 am 1d9a312c: am 3d2c2980: am a2231a75: am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev 
* commit '1d9a312c2c6a372071572fb32e10de19e67482d6':
  Show charging speed on Keyguard
 2015-07-14 20:15:27 +00:00
Jeff Sharkey
983294596e Better handling of storage paths. 
Give more details about why we failed to create storage paths, and
search for underlying volumes using canonical paths.

Bug: 22135060
Change-Id: I75d3584403ece310438b05f5b9fe72d94c9096c6
 2015-07-14 13:08:22 -07:00
Adrian Roos
9c013a2117 Merge "Show charging speed on Keyguard" into mnc-dr-dev 2015-07-14 19:17:07 +00:00
Marco Nelissen
1cdd6e83fb am b2fef7a8: am f12612c8: am 48c78cfb: am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev 
* commit 'b2fef7a81f39c38eff79897e7af02fff20b829cb':
  Use original path if translated path doesn't exist
 2015-07-14 18:47:52 +00:00
Ian Pedowitz
fbb4a38c7c resolved conflicts for merge of 30efac5a to master 
Change-Id: I0dad4cf10ed01cbf49e33f0c2ed1d6f8a1c893e0
 2015-07-14 11:38:49 -07:00
Adrian Roos
7b04311d88 Show charging speed on Keyguard 
Bug: 8099739
Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
 2015-07-14 18:22:39 +00:00
Xiaohui Chen
7cb69df507 sys user split: refactor systemui user switcher 
BUG:19913735
Change-Id: I017dd1b03fd163c266b8080b969fb7a2e934e26c
 2015-07-14 10:58:29 -07:00
Marco Nelissen
c56668eb22 am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev 
* commit '3ced96178b1b132705e773736cbb707a3a0cd951':
  Use original path if translated path doesn't exist
 2015-07-14 17:36:07 +00:00
Marco Nelissen
aa41103668 Use original path if translated path doesn't exist 
Bug: 22376538
Change-Id: I2f6af4fa31c097e2e2d619a068cf83721091c450
 2015-07-14 08:25:23 -07:00
Paul Crowley
d2c9d0d92c Revert "am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev" 
This reverts commit c5da3fe1de, reversing
changes made to d884b41331.
 2015-07-14 15:42:29 +01:00
Paul Crowley
c5da3fe1de am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev 
* commit '8ae629f6cbda2ad55a1b6f3f508a04dc348ed796':
  Delete the user key when deleting a user.
 2015-07-14 12:00:55 +00:00
Ian Pedowitz
d7be214ca4 resolved conflicts for merge of 8cee6587 to mnc-dr-dev 
Change-Id: I0b2ed52214bb097d7fd69434afd0c6c890b5afb3
 2015-07-13 22:58:29 -07:00
Svet Ganov
6ee871e598 Teach storage appops. 
For modern apps targeting M SDK and up the external storage state
is deterined by granted permissions. For apps targeting older SDK
the storage access is determined by app ops correspning to the
storage permissions as the latter are always granted.

When app ops change we do not remount as we kill the app process
in both cases enabling and disabling an app op since legacy code
is not prepared for dynamic behavior where an operation that failed
may next succeed. Hence, we remount when we start the app.

For modern apps we don't kill the app process on a permission
grant, therefore we synchronously remount the app storage.

bug:22104923

Change-Id: I601c19c764a74c2d15bea6630d0f5fdc52bf6a5a
 2015-07-13 18:22:30 -07:00
Paul Crowley
bac3d0936d Merge "Delete the user key when deleting a user." into mnc-dr-dev 2015-07-13 20:53:57 +00:00
Paul Crowley
9e0e69915a Merge "Use mount service to create user dirs." into mnc-dr-dev 2015-07-13 20:53:09 +00:00
Mathieu Chartier
d288a26672 Change conditionallyCheckInstanceCounts to use countInstancesOfClasses 
countInstancesOfClasses allows passing multiple classes unlike
countInstanceOfClass. This provides a speedup since we dont traverse
the heap multiple times.

Changed ActivityThread.dumpMemInfo to do a GC since countInstancesOfClass
no longer does GC before counting.

https://code.google.com/p/android/issues/detail?id=177552

Change-Id: Ia85684f40cf59a52aa71a8479c711a994651209b
 2015-07-10 15:33:59 -07:00
Dianne Hackborn
b6fbe91a02 am 782e31df: am 2dc2cdc0: am 1dfeb0b2: am d0e005de: am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev 
* commit '782e31dfcc448eaaab814fd76f42c3390a952037':
  Fix issue #22328792: Fix scalability issues in AssistStructure
 2015-07-09 23:29:51 +00:00