Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
229,624 Commits 3 Branches 0 Tags
d901155166983adde84d9da2a6b265371191068a
Commit Graph

229624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Pedowitz
d901155166 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-13 23:21:49 +00:00
Ian Pedowitz
46f890188c Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f am: 0cd5e9f475 
am: 105108209f

* commit '105108209fc35b5029e5a728c09f6eaf91b8a940':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:21:05 +00:00
Ian Pedowitz
f4bb9772a4 Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f am: 0cd5e9f475 
am: 105108209f

* commit '105108209fc35b5029e5a728c09f6eaf91b8a940':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:19:39 +00:00
Robert Greenwalt
47359e813d Merge "Add free short codes for Direct Carrier Billing in Google Play" am: d736cba6e7 
am: be81d28798

* commit 'be81d28798358aed3a3d7de2464242df15e07486':
  Add free short codes for Direct Carrier Billing in Google Play
 2016-01-13 23:18:06 +00:00
xin He
7692bb21a1 Merge "Initial codes for Quality network selection" 2016-01-13 23:14:16 +00:00
Victor Chang
f577d79e43 Merge "Show work missed call notification for sim call from work contacts" 2016-01-13 23:11:36 +00:00
Ian Pedowitz
4395343e0c Merge "Add ITelephonyDebug.aidl" 2016-01-13 23:10:41 +00:00
Ian Pedowitz
105108209f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f 
am: 0cd5e9f475

* commit '0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:10:29 +00:00
Wale Ogunwale
3a9154c8a0 Merge "Fix build breakage." 2016-01-13 23:10:15 +00:00
Pavel Zhamaitsiak
14ef09514b Add ITelephonyDebug.aidl 
(cherry picked from commit f91818ca34)

Change-Id: Ie3c846a90632e3afa793e6e60f5a3390a260c5a5
 2016-01-13 15:09:16 -08:00
Wale Ogunwale
b2d135694f Fix build breakage. 
Bug: 22405482
Change-Id: I8fc522885801e9735544ec3820c8fdd4a4368d71
 2016-01-13 15:08:29 -08:00
Pavel Zhamaitsiak
527e24d617 Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev am: 9ae30e69ad am: fba6bccff5 
am: e737a028b1

* commit 'e737a028b1b1151d43e3ecceb1b2bb10e0c75665':
  Add WiFi Calling overlays for T-Mobile's MCCMNCs
 2016-01-13 23:08:20 +00:00
xinhe
f7705c3ed6 Initial codes for Quality network selection 
In this change list, the old WifiAutojoin module is
    refactored initially. The old WifiAutojoinController is
    replaced with a new WifiQualifiedNetworkSelector.
    WifiConfiguration, WifiConfigureStore and
    WifiStateMachine have been modified accordingly. The new
    network selection logic is refactored with a more clear
    and deterministci one. To refer to thedescribed in
    details, in "Quality Network Selection and Connectivity
    Scan Management in N". The link of the document is:
    https://docs.google.com/document/d
    /1JPTa2NEk-PgjCJ16fIrR6ohV-kDKveDlYDOeiMCB2_c

cherry-picked from 8d106780b6
and make changes on WiFiConfigurationSerializer.java since
it is not on mm-wireless-dev
Bug:26012244
Change-Id: I44e454544b630b891c9a58a18b5a028edcce580f
 2016-01-13 15:06:30 -08:00
Keisuke Kuroyanagi
a2477acec9 Tests for getPrimaryHorizontal with grapheme boundaries am: a5c53291a8 am: 3bb115ba5c 
am: 404a22cf74

* commit '404a22cf74f47bbdbeccb3452aefcfd3c34eee74':
  Tests for getPrimaryHorizontal with grapheme boundaries
 2016-01-13 23:05:34 +00:00
Adam Lesinski
860bd87d5e Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev am: f2cc98bc96 am: 112e26646f 
am: dd0957caf4  -s ours

* commit 'dd0957caf4d16c46971444b00befb415f9a6d549':
  UsageStats: Fix issue where initializing data for first time would cause crash
 2016-01-13 23:03:08 +00:00
Ian Pedowitz
0cd5e9f475 Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 
am: 624d43b66f

* commit '624d43b66f039e3b0f33274486512621919d96a3':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:01:29 +00:00
Ian Pedowitz
624d43b66f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 2016-01-13 22:47:45 +00:00
Victor Chang
9359ee18a5 Show work missed call notification for sim call from work contacts 
BUG=26082618

Change-Id: I82bf3d9835589a309101b23536748ae2b27b1d2d
 2016-01-13 22:44:52 +00:00
Xiyuan Xia
ee9ca3cde7 Merge "Fix a race condition during async credential check" 2016-01-13 22:32:21 +00:00
Filip Gruszczynski
4d0f5ee232 Merge "Fix delivery of visible behind cancel action." 2016-01-13 22:01:05 +00:00
Filip Gruszczynski
4e7fe7142e Fix delivery of visible behind cancel action. 
Bug: 26471802

Change-Id: I4e35f904080d1c57bbb034725d34d8c5bca87238
 2016-01-13 14:00:31 -08:00
Yin-Chia Yeh
b99ed40fb0 Merge "Camera: cleanup dead code" 2016-01-13 21:50:02 +00:00
Alan Viverette
156bd49bdc Revert "Avoid drawable invalidation during draw()" 
This reverts commit e5e59c6da4.

Drawables expect to be able to call invalidateSelf() during
draw() to pump animation frames. We shouldn't break this.

Bug: 26533725
Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47
 2016-01-13 21:49:10 +00:00
Samuel Tan
01208118b3 resolve merge conflicts of 3caecaec60 to master. 
Change-Id: Ic3e9909c69f03a6ef1911a6b7589afbc02d7494f
 2016-01-13 13:42:00 -08:00
Robert Sesek
3242734d05 Merge "Fix SDK docs after b9a8666eb5504f022343fef9087135b7d937ddf8." 2016-01-13 21:24:00 +00:00
Felipe Leme
50f9c75a9a Merge "Save bugreport info on share intent." 2016-01-13 21:23:09 +00:00
Felipe Leme
c4f6467702 Save bugreport info on share intent. 
When a bugreport is finished, BugreportProgressService sends a
INTENT_BUGREPORT_SHARE intent containing the bugreport pid; then when
the user clicks the share notification, BugreportProgressService uses
the pid to retrieve the bugreport info.

The problem with this approach is that if the service dies before the
user clicks the notification, the bugreport won't be shared.

This change fix this scenario by saving the bugreport info in the share intent.

BUG: 26513652

Also added more logging statements.

Change-Id: Iba86d06369f843ad88194fb1dad0c8b69764df78
 2016-01-13 13:01:07 -08:00
Chong Zhang
defd8f3b22 Merge "Several fixes for docking non-resizeable tasks" 2016-01-13 20:55:55 +00:00
Robert Greenwalt
be81d28798 Merge "Add free short codes for Direct Carrier Billing in Google Play" 
am: d736cba6e7

* commit 'd736cba6e7f93a2e6df172a644e413f27a1dc939':
  Add free short codes for Direct Carrier Billing in Google Play
 2016-01-13 20:48:14 +00:00
Pavel Zhamaitsiak
e737a028b1 Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev am: 9ae30e69ad 
am: fba6bccff5

* commit 'fba6bccff5d230b581e46ed64911d0c67e4be442':
  Add WiFi Calling overlays for T-Mobile's MCCMNCs
 2016-01-13 20:44:08 +00:00
Robert Sesek
7b0143cef4 Fix SDK docs after b9a8666eb5. 
Change-Id: Icad19dd1c888b4857d288b460d88bebb9ec20a13
 2016-01-13 15:35:50 -05:00
Pavel Zhamaitsiak
fba6bccff5 Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev 
am: 9ae30e69ad

* commit '9ae30e69ada03ebf3408ed1d2f24a5a67ea33b68':
  Add WiFi Calling overlays for T-Mobile's MCCMNCs
 2016-01-13 20:35:46 +00:00
Robert Greenwalt
d736cba6e7 Merge "Add free short codes for Direct Carrier Billing in Google Play" 2016-01-13 20:35:34 +00:00
Chong Zhang
f66db43063 Several fixes for docking non-resizeable tasks 
- Keep track of original task bounds and scrolled bounds separately,
  so that we can reset the scrolling when the it's no longer in effect.

- Calculate the vertical offset for the toast on top half using the
  content rect. The original toast position was relative to the bottom
  of the content rect, not the display rect.

- Move toast display to prepareSurfaceLocked, as performShowLocked() may
  not be called if the app surface is already shown.

related-to: b/26451625
related-to: b/26447921

Change-Id: I82113683c9e3c3beb4938dbd0829d0abf491efd9
 2016-01-13 12:31:08 -08:00
Julia Reynolds
f890afad17 Merge "Mock compliance for notification guts." 2016-01-13 20:30:48 +00:00
Pavel Zhamaitsiak
9ae30e69ad Merge "Add WiFi Calling overlays for T-Mobile's MCCMNCs" into mnc-dr1.5-dev 2016-01-13 20:30:46 +00:00
xin He
5713b9acc3 Merge "Initial codes for Quality network selection [DO NOT MERGE]" into mm-wireless-dev 
am: 5961142109  -s ours

* commit '596114210980ae89d040ee86a5daad257c6e5f4c':
  Initial codes for Quality network selection [DO NOT MERGE]
 2016-01-13 20:18:58 +00:00
Julia Reynolds
205053615c Mock compliance for notification guts. 
Change-Id: I6fc63ad5b9c241d5e003a9810fde6f5aea48214e
 2016-01-13 15:13:03 -05:00
xin He
5961142109 Merge "Initial codes for Quality network selection [DO NOT MERGE]" into mm-wireless-dev 2016-01-13 20:03:50 +00:00
Adam Lesinski
71f42ad4d6 Merge "UsageStats: Fix issue where initializing data for first time would cause crash" 2016-01-13 20:03:26 +00:00
Dongwon Kang
9b554abf2b Merge "MediaResourceMonitor: Shorten the TAG" 2016-01-13 20:01:22 +00:00
Chong Zhang
cb11f8a288 Merge "Fix rect convert from screen to surface coordinates with scaling" 2016-01-13 19:52:45 +00:00
Dongwon Kang
ee3d8118b3 MediaResourceMonitor: Shorten the TAG 
Bug: 26541185
Change-Id: Iad1115cfc31b458dc0daa0fe37efd795fb0a32fb
 2016-01-13 11:51:45 -08:00
Sandra Kwan
f56a60fab2 Merge "AccountManager: make account session APIs SystemApi." 2016-01-13 19:46:21 +00:00
Chong Zhang
8438957153 Fix rect convert from screen to surface coordinates with scaling 
When there is scaling, the top/left coordinates are also scaled. They
could be non-zero if the app is being cropped (eg. due to two-finger
scroll).

bug: 26451625
Change-Id: I90d537347b312d2438993780f52b023c2332eb68
 2016-01-13 11:32:58 -08:00
Filip Gruszczynski
3e979d6229 Merge "Only request stack resize after non full screen bounds were set." 2016-01-13 19:31:31 +00:00
Filip Gruszczynski
dce2d16170 Only request stack resize after non full screen bounds were set. 
Also make sure that the bounds passed to stacks and tasks are not bogus,
as these would mess up the configuration.

Bug: 26512887
Change-Id: I1a3a9c867a2c258a326b31df2bac614ccbb00579
 2016-01-13 11:30:58 -08:00
Chet Haase
f73363cf51 Merge "Make Animation.cancel() actually work" 2016-01-13 19:30:29 +00:00
Pavel Zhamaitsiak
b6baaf30cd Add WiFi Calling overlays for T-Mobile's MCCMNCs 
Bug: 26024279
Change-Id: I71920fc45dec3e4fe5a3f4e349ff1ba3df703000
 2016-01-13 11:19:05 -08:00
Chong Zhang
71888e9ff8 Merge "Launch non-resizeable task with fullscreen bounds in docked stack." 2016-01-13 19:18:39 +00:00