Commit Graph

309172 Commits

Author SHA1 Message Date
Suprabh Shukla
ec3e2b9dcb DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b
am: b278ed787e  -s ours

Change-Id: Ib70440bdd1c60ed5eaa9b8c8152a4745f44cacd6
2017-02-02 22:41:38 +00:00
Jack Yu
37d3b12aa1 Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69
am: fab95f8ad6

Change-Id: I7c8ac34bfb4bf1bcf6323163ef872d83ee58bfcc
2017-02-02 22:41:34 +00:00
Suprabh Shukla
429683b469 Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours
am: 14e38a8b21

Change-Id: Ib5e1e997168d33810e36510bebe6783382211059
2017-02-02 22:39:22 +00:00
Suprabh Shukla
50c6d2ff56 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours
am: 3a09dac9c4

Change-Id: I7c001da58aee7ea4784a8fb8c8a2a2498bfba533
2017-02-02 22:38:31 +00:00
Jack Yu
fab95f8ad6 Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746
am: 426f454b69

Change-Id: I063d17c3eeb6f5b6ec32c261b22ccea273c572ea
2017-02-02 22:36:03 +00:00
Suprabh Shukla
b278ed787e DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a
am: 21992d997b

Change-Id: Ib5ba5eb63227be2fbf25a79e7f8f8e42b1cc9a2b
2017-02-02 22:36:03 +00:00
Suprabh Shukla
14e38a8b21 Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda
am: aec526f710  -s ours

Change-Id: I383f706dfc0690352c3b4d6358ed1269c15ed8b8
2017-02-02 22:34:55 +00:00
Suprabh Shukla
3a09dac9c4 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69
am: c22e6d15d1  -s ours

Change-Id: I80fa5e3991464bf99111c00b1074a4e5c7ef9130
2017-02-02 22:34:02 +00:00
Jack Yu
426f454b69 Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10
am: 413922e746

Change-Id: I8664d6e42113b4c22741b06780727b10c2e6804e
2017-02-02 22:31:29 +00:00
Suprabh Shukla
21992d997b DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 8cdc04957a

Change-Id: I7c1b9e9f785ef99575136d9af0b062dad759c17a
2017-02-02 22:31:29 +00:00
Suprabh Shukla
aec526f710 Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev
am: 3ced78bdda

Change-Id: I4da6e2894de769fb028ad713290b62e38925294a
2017-02-02 22:29:02 +00:00
Suprabh Shukla
c22e6d15d1 DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 835c8b3d69

Change-Id: I080d11d3d7d6434b832f8ecb1ee93c17a6d7cb4a
2017-02-02 22:28:59 +00:00
Jack Yu
413922e746 Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564
am: 40d0753b10

Change-Id: I1f8a897862c69a475c6d12a824bd69ed8692cd99
2017-02-02 22:26:09 +00:00
Suprabh Shukla
3ced78bdda Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev 2017-02-02 22:23:12 +00:00
Jack Yu
40d0753b10 Fixed the logic for tethering provisioning re-evaluation
am: 91a0bc9564

Change-Id: I4c499b756c019d83a61e61da3065f31a4d8672f2
2017-02-02 22:21:00 +00:00
TreeHugger Robot
45c87d943d Merge "Enabling USB Debugging Connected notification on Android TV" 2017-02-02 21:57:28 +00:00
Adam Lesinski
dc5cd8b323 Merge "AssetManager2: Add other support methods" 2017-02-02 21:48:14 +00:00
Steven Thomas
396d8fb431 Disable VR compatibility display
The VR compatibility display is causing issues with the 2d <--> VR
transition in SurfaceFlinger. Disable it until we figure out what's
going on.

Bug: 34280358

Test: Had flakiness when transitioning into/out of VR mode via cube sea
and treasure hunt, with the VR compatibility display enabled. After
disabling the VR compatibility display, transitioning was much more
stable, though not perfect.

Change-Id: I7822fff2095e4bb8eb0b4157c0d9fd06e99f48c8
2017-02-02 13:40:37 -08:00
TreeHugger Robot
de3f962e8a Merge "Update the drag to dismiss UI to be closer to design" 2017-02-02 21:40:19 +00:00
Pierre Lecesne
2599aa4dfd Add a method LoadedApk::WriteToArchive.
Test: Manually.

Change-Id: I61717204e58ca2bbfba9a52c7aecf27882a853f8
2017-02-02 21:35:21 +00:00
Paul Lawrence
46e48b9aa4 resolve merge conflicts of fde0a41065 to master
Test: Make sure builds, boots
Change-Id: Idf86dc5d888c09e8a65ada51fc2f32aae6d5570d
2017-02-02 13:28:45 -08:00
TreeHugger Robot
4fc4100e2d Merge "Add comment to netstats proto" 2017-02-02 21:21:14 +00:00
Alex Deymo
85adc21488 Merge "Compile native network functionis into libandroid_net." am: b1cb60d920 am: 5292c727b7 am: b92ba328e4
am: ff727728b5

Change-Id: Iab936db453c1c2dc28cdb19bfa9ed6b10471c54d
2017-02-02 21:11:51 +00:00
Jason Monk
d7af66d0c3 Merge "Move recents CommandQueue callbacks to recents" 2017-02-02 21:09:29 +00:00
Alex Deymo
f2f6961b7b Compile native network functionis into libandroid_net. am: f3b7411060 am: af657d14fc am: 74a410ec81
am: 2e61c0eea3

Change-Id: I7a1d3c40bcf76a3e6eabb3eddff159a53af0c5c1
2017-02-02 21:08:08 +00:00
Hugo Benichi
dfc152bd32 Merge "Revert "Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e am: 7b39349792"" into nyc-mr2-dev-plus-aosp
am: c23ff1d477

Change-Id: I9161929f3a7308be4764dbb50e443a46fdc4960c
2017-02-02 21:05:11 +00:00
Hugo Benichi
f0d5ce73fe Revert "Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e am: 7b39349792"
am: 6776f79012  -s ours

Change-Id: I80ce623da40db32faa3bef88ee2612a1a163e777
2017-02-02 21:05:00 +00:00
sergeyv
db92bb71d0 Check if layer is created in detachSurfaceTexture
Test: manual
bug:34937475
Change-Id: Iaab7a341917456b40427efd2746d33ddd88514d1
2017-02-02 12:57:30 -08:00
Dmitry Dementyev
e366f82cef Update Account Discovery API.
Use package name instead of uid.
Check calling package name in getAccounts methods.

Bug: 34841115, 34841115
Test: cts tests, manual tests.
Change-Id: I8a9e6aea5e2b6677be4bc414836b842239c5b6ac
2017-02-02 12:41:40 -08:00
Abodunrinwa Toki
fafdb7372f Fix TextClassifier.getTextClassificationResult()
Gracefully handles situations where a default app cannot be found
to handle the intent.

1. If we can not find any app to handle the intent,
   do not include an "assist" menu item entry to fire the intent.
   Also, do not linkify the entry.
2. If we do not have a default app to handle the intent,
   show a generic title for apps that will handle the intent
   and do not include an icon.

In the ideal case where we find a default app to include the intent,
show the app's (preferably activity's) title and icon.

Test: Manually tested. There's an AI to write more automated tests.
Bug: 34777322
Bug: 34927631
Change-Id: Ia94efbbdda3da8f181fac9228cd2d3a76cb727d3
2017-02-02 20:35:51 +00:00
Selim Cinek
c494e38c07 Fixed that the HUN layout could be visible on Keyguard
Test: runtest systemui
Change-Id: I9d106b6b021bb15fd709a6281beed8ab084201db
Fixes: 34548351
2017-02-02 12:25:58 -08:00
Geoffrey Pitsch
580f32d7b0 Merge "SystemUI uses Builder API with NotificationChannel" 2017-02-02 20:25:48 +00:00
Selim Cinek
b5aa599eec Fixed that the HUN layout could be visible on Keyguard
Test: runtest systemui
Merged-In: I9d106b6b021bb15fd709a6281beed8ab084201db
Change-Id: I9d106b6b021bb15fd709a6281beed8ab084201db
Fixes: 34548351
2017-02-02 12:22:10 -08:00
Hakan Seyalioglu
8be3372bd6 Merge "DO NOT MERGE - Check exported status in chooser" into nyc-mr2-dev
am: a5a296e661

Change-Id: I5ca395a57c5c3c6d01ddacd541c3c8d80fab42c8
2017-02-02 20:16:30 +00:00
Hakan Seyalioglu
531def93f0 DO NOT MERGE - Check exported status in chooser
am: e3286c3145

Change-Id: I55a6e9ed942a4542dcdf497e297654b666d88fb0
2017-02-02 20:16:23 +00:00
TreeHugger Robot
a5a296e661 Merge "DO NOT MERGE - Check exported status in chooser" into nyc-mr2-dev 2017-02-02 20:10:52 +00:00
TreeHugger Robot
e8ae5566fb Merge "Batterystats commands to simulate screen on/off" 2017-02-02 20:05:45 +00:00
TreeHugger Robot
1feb6cefd1 Merge "AudioService: query a11y manager at init for a11y volume active" 2017-02-02 20:05:20 +00:00
TreeHugger Robot
42ad9aabe3 Merge "Fixing crash when task is already parent of activity." 2017-02-02 20:05:02 +00:00
Erik Kline
e8bc75bfcc Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe am: 6f32aa0259 am: 7196e935a8
am: c700509ade

Change-Id: I15fe6fe4c9aec3d244b46516c2992ded33337a9f
2017-02-02 20:03:51 +00:00
Hugo Benichi
b81bc507ff Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e am: 7b39349792
am: 814a59ba82  -s ours

Change-Id: Iafa147a12cfa9ba559458c72ab47553c847cd115
2017-02-02 20:02:40 +00:00
TreeHugger Robot
62e1a05076 Merge "Alert Windows behavioral changes" 2017-02-02 19:47:29 +00:00
Peter Qiu
637c407d78 Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am: e724f82b3d am: 281fae21f8
am: eeeb10c645

Change-Id: Ib218b76e03bb6a6082113d27ec514b03f2348b6e
2017-02-02 19:46:51 +00:00
Peter Qiu
d46383ee0b hotspot2: expose Passpoint APIs as public
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I8bf5c715b9088c673e59a73a78e18f6e6b64d1d1
2017-02-02 11:45:13 -08:00
Peter Qiu
bb700dc826 hotspot2: fix class/function/variable names to comply with API guideline
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworsk/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ide425c06be46bc41c8f601e732dca0543de096b1
2017-02-02 11:45:13 -08:00
Peter Qiu
91930d786b hotspot2: rename classes to comply with API guideline
This is purely a file rename operation.

Bug: 34862444
Test: None
Change-Id: I297a228f3ee7e09c9cce5ca9f677eb1db478fd46
2017-02-02 11:45:00 -08:00
Winson Chung
ba7db92d16 Fixing crash when task is already parent of activity.
- When launching an activity into a task, it's parent is already set
  which can cause the reparent call to crash.  Instead, just move the
  activity to the top.

Bug: 34933399
Test: Launch an app that doesn't support multiwindow, and engage split
      screen, or launch a PiP activity and tap to show the menu

Change-Id: Iaa36003e88f4021f2483dedc71802023369d6558
2017-02-02 19:43:54 +00:00
Peter Qiu
eeeb10c645 Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am: e724f82b3d
am: 281fae21f8

Change-Id: I1baeb7afdff6fbc399ab16ef7aa266506ef7aacb
2017-02-02 19:42:51 +00:00
TreeHugger Robot
c21f12d4eb Merge "Add hidden KeyProtection API to specify SID" 2017-02-02 19:39:45 +00:00
Peter Qiu
281fae21f8 Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field"
am: e724f82b3d

Change-Id: I250566dbd8dff8c50692e47b1b3e9bb7568bb8b4
2017-02-02 19:37:50 +00:00