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

219653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerry Wong
32d52f344a Incorrect time used in some NTP server responses 
Per RFC 4330, a NTP server response should be discarded when:
    - the stratum is 0 (unspecified), or
    - the leap indicator is 3 (unsync'ed), or
    - the mode is not 4 (server) / 5 (broadcast), or
    - the transmitted time is 0.

Update SntpClient so that such responses would be discarded.

Additionally:
    - make some variables suitably "final"
    - enable logging
    - add alternate requestTime() for testing
    - add some miniscule test coverage

Cherry-picked from Jerry Wong's

    https://partner-android-review.googlesource.com/#/c/460074

Bug: 24719581
Change-Id: Id11a79a6e53ce95500ed4b4d691a29c260666f6c
 2015-10-17 03:36:32 +09:00
Tyler Gunn
beecb61554 am a7304cac: (-s ours) am 723900d7: am 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 
* commit 'a7304cac85d8c5b0de3cbbe127516675f6cfde5c':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
 2015-10-16 18:00:22 +00:00
Tyler Gunn
a7304cac85 am 723900d7: am 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 
* commit '723900d76a45e8974f357333b72a7df0a7ec4fca':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
 2015-10-16 17:52:17 +00:00
Tyler Gunn
723900d76a am 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 
* commit '95b84f52517548adbd0dff7a22c41c5c4d249c44':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
 2015-10-16 17:45:31 +00:00
Chris Craik
afae1463b3 Merge "Revert "Use FastJNI for trivial MotionEvent native methods"" 2015-10-16 17:43:08 +00:00
Chris Craik
526cf82652 Revert "Use FastJNI for trivial MotionEvent native methods" 
This reverts commit a44cd33b98ed011a62a912406eddc051f8b3ded1.

Change-Id: I9a907b0a880368dd61b481b642b50ab57ad08de8
 2015-10-16 17:42:57 +00:00
Tyler Gunn
95b84f5251 am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 
* commit 'a5917b71b0e2f98fa6906b795b28cab059cc092b':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
 2015-10-16 17:40:19 +00:00
Tyler Gunn
a5917b71b0 Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 2015-10-16 17:36:40 +00:00
Filip Gruszczynski
9d24cbca0a Merge "Disable stack cropping for docked animating windows only." 2015-10-16 17:32:04 +00:00
Jun Mukai
547c346bb3 Merge "Allow changing mouse cursor for the edges of resizable window." 2015-10-16 17:13:25 +00:00
Jun Mukai
41aab00c3e Allow changing mouse cursor for the edges of resizable window. 
Bug: 23193951
Change-Id: I38662a61ff829e5b441e1c8b9f472eb0d75904e4
 2015-10-16 10:11:32 -07:00
Filip Gruszczynski
955b2fc732 Disable stack cropping for docked animating windows only. 
Non docked windows should be cropped by the stack bounds when they
animate. An example of this is having both a docked activity and a full
screen activity resuming together. The full screen activity should be
cropped.

Bug: 24913915

Change-Id: I35ed71e7625f2fcdb5c51649be9f33d5773c162c
 2015-10-16 10:07:29 -07:00
Abodunrinwa Toki
cd2ed62b1e am 6a82ccbc: (-s ours) am 85978d7c: am a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev 
* commit '6a82ccbce945fc52bdc35b1cf7661e138feeec2d':
  DO NOT MERGE: Reduce delay of floating toolbar appearance.
 2015-10-16 17:02:02 +00:00
Chris Craik
e4436e325c Merge "Add LinearStdAllocator" 2015-10-16 16:57:23 +00:00
Abodunrinwa Toki
6a82ccbce9 am 85978d7c: am a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev 
* commit '85978d7c36e94f107bd72166bc18f893b4817cf9':
  DO NOT MERGE: Reduce delay of floating toolbar appearance.
 2015-10-16 16:56:38 +00:00
Chris Craik
c4c7aa14af Merge "Use FastJNI for trivial MotionEvent native methods" 2015-10-16 16:53:34 +00:00
Abodunrinwa Toki
85978d7c36 am a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev 
* commit 'a3234f01927e6908cc4e08ddcff9c1646d5a91bb':
  DO NOT MERGE: Reduce delay of floating toolbar appearance.
 2015-10-16 16:49:19 +00:00
Jeff Sharkey
e1ed980d4c am de0b34ea: am d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 
* commit 'de0b34ea14cfd5a5d219ee6e3d15ca4b04b6ce2e':
  Update docs to reflect adoptable behavior.
 2015-10-16 16:45:35 +00:00
Roshan Pius
482e9d9984 DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA. 
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network. Setting it to 100ms by default.
This is based on a similar set of changes for IMS calls: ag/747865.

BUG: 19118840
Change-Id: Ifb64fe406509fe7c401ad1c4b4e906d6643e327b
 2015-10-16 09:45:29 -07:00
Abodunrinwa Toki
a3234f0192 am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev 
* commit '9c76f61dea69e21eba3b89adbc2a00bcb522584e':
  DO NOT MERGE: Reduce delay of floating toolbar appearance.
 2015-10-16 16:41:26 +00:00
Wale Ogunwale
096b0ece6e am 704127b1: am ad8e78c7: am 29ffdc91: am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev 
* commit '704127b1a0a6762acd2de097ee28e2a7e39ee910':
  Disassociate system windows from apps
 2015-10-16 16:41:19 +00:00
Wale Ogunwale
8e0d7f6173 Merge "Use StringBuilder to construct window title string." 2015-10-16 16:38:42 +00:00
Jeff Sharkey
de0b34ea14 am d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 
* commit 'd56756fdee9fce3d08bea769710d7173bcbc263a':
  Update docs to reflect adoptable behavior.
 2015-10-16 16:38:29 +00:00
Abodunrinwa Toki
9c76f61dea Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev 2015-10-16 16:36:28 +00:00
Wale Ogunwale
704127b1a0 am ad8e78c7: am 29ffdc91: am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev 
* commit 'ad8e78c7033b2f5977f779ff8d85a4a8a690d362':
  Disassociate system windows from apps
 2015-10-16 16:33:48 +00:00
Jeff Sharkey
d56756fdee am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 
* commit '535726f637d952f172e7758e4f0faf725a838add':
  Update docs to reflect adoptable behavior.
 2015-10-16 16:33:18 +00:00
Xiaohui Chen
f04f3005b0 Merge "Add UserHandle.isSystem() api" 2015-10-16 16:29:44 +00:00
Wale Ogunwale
ad8e78c703 am 29ffdc91: am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev 
* commit '29ffdc91b8a6adeab036d56cb57cbd363a0196d0':
  Disassociate system windows from apps
 2015-10-16 16:28:26 +00:00
Jeff Sharkey
535726f637 am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 
* commit '0c15693e8de6f89fab7ca3d582f0a8605a54df9f':
  Update docs to reflect adoptable behavior.
 2015-10-16 16:25:38 +00:00
Wale Ogunwale
29ffdc91b8 am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev 
* commit 'be6555105a9325d0b7073c08a0bd4dc0b5ce1fb3':
  Disassociate system windows from apps
 2015-10-16 16:18:45 +00:00
Jeff Sharkey
0c15693e8d Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 2015-10-16 16:18:38 +00:00
Wale Ogunwale
be6555105a Merge "Disassociate system windows from apps" into mnc-dr-dev 2015-10-16 16:14:45 +00:00
Wale Ogunwale
9b34442568 Use StringBuilder to construct window title string. 
Change-Id: I9193b7f5180f165d517cbfe0345f84e161b851d2
 2015-10-16 09:07:45 -07:00
tiger_huang
20ebb4c2d4 Disassociate system windows from apps 
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.

This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).

This change is related to the following changes:
a5d29971f8
15ed2754a3
c3672cd3f7
41725dedc3

Bug: 24967303
Bug: https://code.google.com/p/android/issues/detail?id=189710

Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
 2015-10-16 08:21:45 -07:00
Abodunrinwa Toki
a6200068af DO NOT MERGE: Reduce delay of floating toolbar appearance. 
Bug: 21956394
Change-Id: I3db39e84afd3474b5bb53522c5a4c738ec1511bf
 2015-10-16 16:01:00 +01:00
Wale Ogunwale
d4f2b641d3 am be02134c: am fceaedda: am 75693994: Merge "Disassociate system windows from apps" 
* commit 'be02134cbc7ef98e73f118aba45a92908d818553':
  Disassociate system windows from apps
 2015-10-16 14:08:14 +00:00
Wale Ogunwale
be02134cbc am fceaedda: am 75693994: Merge "Disassociate system windows from apps" 
* commit 'fceaedda41f9133a4d4213720b15950ef43dd00c':
  Disassociate system windows from apps
 2015-10-16 14:00:47 +00:00
Wale Ogunwale
fceaedda41 am 75693994: Merge "Disassociate system windows from apps" 
* commit '75693994f60bdec9a10db98ddb8addd2bc3f8bbb':
  Disassociate system windows from apps
 2015-10-16 13:54:54 +00:00
Wale Ogunwale
75693994f6 Merge "Disassociate system windows from apps" 2015-10-16 13:50:35 +00:00
Sanket Padawe
4ae088957f am 902cb106: am cf471efd: am 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev 
* commit '902cb106fe8d06274462e4cea4afb29c1ffa0c03':
  Mask IccId which gets printed in bug reports & radio logs.
 2015-10-16 12:07:57 +00:00
Dianne Hackborn
604834cadb am 700d1fbd: am 401f68b9: am 510f03c5: am 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev 
* commit '700d1fbd0ee0e65a3bf6587f6dd0e7d9a4e114a2':
  Fix issue #24571425: Device does not come out of idle mode for maintenance
 2015-10-16 12:07:32 +00:00
Alan Viverette
7de90e23e2 am d76757d7: am b36aebbe: am ffa8fd0e: am 6a032a3a: Don\'t project ripple for adequately tall spinners 
* commit 'd76757d7ad1bd8fa1b45b9aefa5ddafafedffb55':
  Don't project ripple for adequately tall spinners
 2015-10-16 12:07:23 +00:00
tiger_huang
ff58e30aca Disassociate system windows from apps 
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.

This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).

This change is related to the following changes:
a5d29971f8
15ed2754a3
c3672cd3f7
41725dedc3

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

Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
 2015-10-16 12:30:38 +08:00
Filip Gruszczynski
7be9a8c8af Also calculate minimal task size when window manager is set. 
Bug: 21409825
Change-Id: If0dbbd8976607a5c0db13f608af01f21c41f45ed
 2015-10-15 18:20:30 -07:00
Sanket Padawe
902cb106fe am cf471efd: am 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev 
* commit 'cf471efd5f722a4cb7c1094e30b111ef312ef133':
  Mask IccId which gets printed in bug reports & radio logs.
 2015-10-16 00:57:02 +00:00
Sanket Padawe
cf471efd5f am 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev 
* commit '001a651e4b0919239f09b25ae99d132585b5d382':
  Mask IccId which gets printed in bug reports & radio logs.
 2015-10-16 00:51:49 +00:00
Sanket Padawe
001a651e4b am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev 
* commit '8d6d735fa8cea74f53ba29063b72b856fef69d8e':
  Mask IccId which gets printed in bug reports & radio logs.
 2015-10-16 00:41:44 +00:00
Sanket Padawe
8d6d735fa8 Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev 2015-10-16 00:38:55 +00:00
Chris Craik
81a1d2a159 Add LinearStdAllocator 
Also fixes microbench DisplayListData leak.

Change-Id: I1c46f6d0d38650327f3df90e7b278fa7765083dc
 2015-10-15 17:14:45 -07:00
Filip Gruszczynski
d2f1d94fe5 API for minimal width/height of an activity. 
Bug: 21409825

Change-Id: Id6286064713672366dd4dc1f80258450a8039c36
 2015-10-15 17:02:59 -07:00