Commit Graph

69739 Commits

Author SHA1 Message Date
Eino-Ville Talvala
749967cfa5 android.view.Surface: Add parceling warning am: f005f5ed88 am: 286b1a83e4
am: b13b6bd20e

Change-Id: I05b118022efb506ba57e93e1f58a077ebb951f55
2016-08-31 22:53:05 +00:00
Patrick Tjin
167e48417e BootReceiver: Report correct headers for last messages am: 60c17395a6 am: 56734f96ec
am: 7eb4b15e4b

Change-Id: I3201e2e35b09c871f2505d7609b75259776392ea
2016-08-31 22:31:58 +00:00
Ned Burns
c8a00b2478 Add rotary encoder support to scrolling containers am: 20ad073581
am: dc47505734

Change-Id: I20d6731276defbc2605ca078011c5c1bc5f18cdc
2016-08-31 22:28:55 +00:00
Jorim Jaggi
32cbdcc8c0 resolve merge conflicts of c5bafe2 to master
Change-Id: I19dd5c88c664313c2f8b47d8f8fd556f630c8bf1
2016-08-31 13:51:50 -07:00
Tor Norbye
366a3f14f5 Merge "Add SYSTEM_HEALTH_SERVICE to the ServiceName typedef" 2016-08-31 19:23:41 +00:00
TreeHugger Robot
1ae9143d7a Merge "Do not leak usb device connection FD" 2016-08-31 18:03:12 +00:00
Tony Mak
72b817d1e6 Merge "Send ACTION_DEVICE_OWNER_CHANGED broadcast after clearing device owner" 2016-08-31 10:16:59 +00:00
Greg Kaiser
f4d609b9c0 ContextHubService: Hack in Google vendor value am: 5817ce0c13 am: 3d2f2a4305
am: ee483f7d78

Change-Id: I8ca30026b44d6ccea7cefa4b6671b4f286c352b5
2016-08-31 03:04:41 +00:00
Pablo Ceballos
1209bc144b Fail createVirtualDisplay with single-buffered Surface am: aff2f94939 am: d387b20dcb
am: 658f26634f

Change-Id: I499988d911ffd5ccd4b5bc10c75f3e0ed9a897c8
2016-08-31 02:56:35 +00:00
Adam Powell
8c52bf51a2 Fixes for ImageView drawable visibility dispatch am: 06f9eb8b62 am: fd86f7fdfd am: ee2f4d890e
am: 393279da8f

Change-Id: I7e42805b096de31e388cd86ee87b44f312841aed
2016-08-31 00:54:04 +00:00
Todd Kennedy
8402d225c0 Enable web action apps based on system setting am: efc1c4d501 am: 742f4de6cf
am: 66db34fbe2

Change-Id: Ic1726786e0baeaf758381f3a9a9324ea39b921be
2016-08-31 00:37:13 +00:00
Tor Norbye
5afebff407 Add SYSTEM_HEALTH_SERVICE to the ServiceName typedef
Change-Id: I65c78a079152b2c4d82f8228ca14714ffff282c5
2016-08-30 17:12:53 -07:00
Abodunrinwa Toki
306bcc3dd4 Merge "EditText: Proper support for "textIsSelectable"." 2016-08-30 19:04:38 +00:00
Eino-Ville Talvala
b13b6bd20e android.view.Surface: Add parceling warning am: f005f5ed88
am: 286b1a83e4

Change-Id: I799dca3ed9da618ec88b8d554520aba649918d94
2016-08-30 17:57:12 +00:00
Philip P. Moltmann
674e8c3825 Do not leak usb device connection FD
The native code uses mNativeContext=0 to indicate that is was already
closed and checks this properly. Hence let's leave the checking in the
native code.

We need to keep a reference in UsbRequest as otherwise the
UsbDeviceConnection might get finalized while a UsbRequest is in
progress. The UsbRequest itself makes sure that it is not garbage
collected while the I/O is in progress.

Also I added CloseGuards to make sure the classes are used properly and
fixed an error string in the native code.

Fixes: 31124312
Bug: 31021315
Change-Id: I96deb73957eba0e14e6b656988a2ae9b409bf55f
2016-08-30 10:52:39 -07:00
Eino-Ville Talvala
286b1a83e4 android.view.Surface: Add parceling warning
am: f005f5ed88

Change-Id: Id2c772873fbf98653e751036790484d0fbf7bb16
2016-08-30 17:50:12 +00:00
Greg Kaiser
ed2a5f8592 ContextHubManager: Document InstanceInfo bug am: 3be73d3950 am: 6f155aa4bf
am: 7fd9e40381

Change-Id: I0f95997e013d5cb8fb23b18ad82763cc091e38f1
2016-08-30 17:20:09 +00:00
Paul Stewart
c4ec49b7b9 Document correct context for obtaining WifiManager am: 0e164b199e am: b09557b3cf
am: 163a135246

Change-Id: I943a2d60461633b9432bdf83c3b25086bba22b94
2016-08-30 17:20:02 +00:00
Tony Mak
1970f97e47 Send ACTION_DEVICE_OWNER_CHANGED broadcast after clearing device owner
Change-Id: Iaac182c69a30e941da3a017a923247d813881521
Fix: 27261692
2016-08-30 17:41:48 +01:00
Jason Monk
90a788e29b resolve merge conflicts of d70ed99 to master
Change-Id: I3a8d3708e050b3fb963dd057c0be9d2d249d037a
2016-08-30 10:54:03 -04:00
Victor Chang
3f98ea1eee Merge "forceUpdateUserSetupComplete should have no effect in user build" 2016-08-30 12:38:53 +00:00
Patrick Tjin
7eb4b15e4b BootReceiver: Report correct headers for last messages am: 60c17395a6
am: 56734f96ec

Change-Id: Ieabeda97789d8aabc4e2aecb38ec5bc700061022
2016-08-30 05:31:58 +00:00
Patrick Tjin
56734f96ec BootReceiver: Report correct headers for last messages
am: 60c17395a6

Change-Id: Ib938941dc0cdc066a476964732fc6ce7ee3daac9
2016-08-30 05:22:48 +00:00
Ned Burns
dc47505734 Add rotary encoder support to scrolling containers
am: 20ad073581

Change-Id: Icb513cdc1d6e035dbb111b16a64d99899c571e42
2016-08-30 03:14:23 +00:00
TreeHugger Robot
aa09263379 Merge "Add rotary encoder support to scrolling containers" into cw-f-dev 2016-08-30 03:10:48 +00:00
Jorim Jaggi
c5bafe26cb Add animation when unoccluding windows (1/2) am: 6626f54e65
am: 314c05db45

Change-Id: I0e9d85e8f90d00fe835c0622438ac5b6afd2b52d
2016-08-30 02:33:24 +00:00
Greg Kaiser
786676eb39 NanoAppFilter: Workaround HubId issues am: 3907049080 am: 41ef2a038d
am: d20ed26dff

Change-Id: Iba85f8939fca3bf097f8778fdd980bd9290a7530
2016-08-30 01:38:27 +00:00
Greg Kaiser
45cad7f70c ContextHubManager: Fix API documentation. am: fac5be2ace am: 921e7ef350
am: fce14d1808

Change-Id: Ib5e0ba71519b2be92064b691c4e7d5b1b51deb81
2016-08-30 01:32:36 +00:00
Greg Kaiser
974c0b6a2c ContextHubService: Don't double report app loads am: fe6d4f518a am: ca627a8cc3
am: 8c94f54e0f

Change-Id: I34887862a05e0cbe3c21e038c31072cd41f363a3
2016-08-30 01:26:40 +00:00
Eino-Ville Talvala
f005f5ed88 android.view.Surface: Add parceling warning
Surface is parcelled partly in java, partly in native, and any fields
added in java have to be accounted for in the native side as well.

Add a warning to avoid issues in the future

Bug: 31162160
Change-Id: I48ca1bc3eea29f1ac3d3065f6defb6ed2be4052a
2016-08-29 17:51:23 -07:00
Mitchell Wills
722de5f9d0 DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
2016-08-29 17:46:44 -07:00
Mark Lu
810d3a5464 docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: fc68813e5c
am: f9537d2a05

Change-Id: Icbd832031e6c3dea5fca8b7984a3c1bc1decd210
2016-08-30 00:43:55 +00:00
Mark Lu
8e701d18fa docs: fix link in Loader reference page am: 9f52b7a4a8 am: c6612637bb
am: 2721e7db4a

Change-Id: Ic5976080ef14387a59914d05be38ecbabf86e332
2016-08-30 00:43:26 +00:00
The Android Automerger
f287780643 Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp 2016-08-30 00:26:21 +00:00
Jorim Jaggi
314c05db45 Add animation when unoccluding windows (1/2)
am: 6626f54e65

Change-Id: I09be1e1b7d830067c354c6cdfd940deafa027a22
2016-08-30 00:25:52 +00:00
Ned Burns
20ad073581 Add rotary encoder support to scrolling containers
Change-Id: I1b7a2a60ac9864f2639af81fff810db601b2fbd4
2016-08-29 20:09:23 -04:00
Chris Craik
dbf69818a2 Cherry pick TextureView fixes
am: 2e8a8a2432

Change-Id: I0f650bf2647f9141f9639a4e8875170640d78237
2016-08-29 23:41:22 +00:00
Mark Lu
914a8a3060 docs: fix broken links in Activity reference am: fa43485910 am: 497c2907fd am: eab610d0a6 am: b03a1b8b25
am: b49a7f8602

Change-Id: Ia961100dce636cdb5aae8f4882012a50d506b6f4
2016-08-29 23:20:47 +00:00
Hemal Patel
c63c19122f resolve merge conflicts of a544221 to nyc-dev-plus-aosp am: 309813c8af
am: ac0b242755

Change-Id: Ia3bb6a624d0696a630df48073bd87595504b4ae1
2016-08-29 23:20:04 +00:00
Yohei Yukawa
87b9a88c32 Make sure IME focus is synced to View focus
am: 8eb07090a4

Change-Id: Ia0db5adc86c72f122a5b9bab91962ffa2923469a
2016-08-29 22:40:07 +00:00
Teng-Hui Zhu
76817faf29 Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test. am: 0a815bb94f am: 3687be955f
am: d607d75790

Change-Id: Id83875c14472af2ba44f0194c897460ec6aa427d
2016-08-29 22:39:09 +00:00
Yuichi Biwa
98a824dbb7 ChooserActivity: Cannot start app that the icon overflows the layout
am: cb3e1237b5

Change-Id: I066aa6f03ea3c45fa1330556bc3a6db29ab48262
2016-08-29 22:18:46 +00:00
Alan Viverette
01ba422091 Set up view state before attaching, jump drawables if needed
am: c328f042a6

Change-Id: Ie3df4a2e889577a7a64adc1fff4d773529da0d61
2016-08-29 22:18:28 +00:00
Abodunrinwa Toki
6507b8b333 FloatingActionMode: Fix screen coordinates.
am: 99c340cad9

Change-Id: I73ff6d1b3bed01d7738634c67a6f6d1a2e755da1
2016-08-29 22:18:07 +00:00
TreeHugger Robot
65bbb6fb09 Merge "resolve merge conflicts of 5827257 to master" 2016-08-29 21:46:44 +00:00
TreeHugger Robot
f0963f82fa Merge "Polish MemoryIntArray" 2016-08-29 21:26:42 +00:00
Chris Craik
2e8a8a2432 Cherry pick TextureView fixes
The following changes are in this commit:

Avoid destroying TextureView surfaces for onStop

bug:30238922

TextureViews will hold onto their backing surfaces, which will allow
them to resume gracefully when the app's surfaces are saved.

Now only resources that are destroyed for onStop are DisplayLists.

(cherry picked from commit 391d560402)

TextureView: destroy layer on destroyHardwareResources event

bug:30468770

(cherry picked from commit 1c16c37d86)

Fix NPE in TextureView

Bug: 30651595

(cherry picked from commit 3c2587f26e)

Fix NPE in TextureView

Bug: 30779663

(cherry picked from commit 7e237189c2)

Fix maps resume being blank

Bug: 30889568

Fixes an issue where mLayer didn't have
the mSurface set on it in certain resume
scenarios.

(cherry picked from commit 03df0834e6)
2016-08-29 14:22:13 -07:00
Jorim Jaggi
6626f54e65 Add animation when unoccluding windows (1/2)
Before there was a jump-cut when a window that was occluding Keyguard
was going away, leading to an ugly flicker. To fix this, we do the
following.

- Always show windows with FLAG_SHOW_WHEN_LOCKED above lockscreen, even
if they don't "match" the currently occluding app (which is null in the
animation case)
- Move wallpaper behind last window that is not hidden by policy, so the
window doesn't get occluded by the wallpaper.
- Add a flag in the setOccluded call whether to animate or not. SystemUI
then plays a nice animation when it's set.
- Override the animation to always be the animation that happens when we
exit a window which is revealing the wallpaper behind, to make it
consistent with the home screen case.

Fixes: 30829255
Change-Id: Ib3fe20fc9003a0f9f291c974740f044ed8707e75
2016-08-29 14:15:33 -07:00
Mitchell Wills
b0b6afc248 Merge changes from topic 'wifi-aosp-master' into stage-aosp-master
* changes:
  NetworkSelectionStatus: Fix copy constructor
  Deprecate QNS network disable reason BAD_LINK
  [NAN] API changes/fixes addressing apilint issues
  [NAN] Add method to ConfigRequest to determine if non-default
  [NAN] Simplify publish/subscribe configuration - merge match filters
  [NAN] Udpate NAN API documentation, clean-up visibility
  [NAN] Do not expose WifiManager.isNanSupported as new API
  [NAN] Update finalize to check and warn user if resources not freed
  [NAN] Fix bad merge use rethrowFromSystemServer
  Add Log.wtf when transitionTo is used improperly
  Ensure BSSIDs are correctly aged out in settings view
  [NAN] Provide calling package name to service
  Add WiFi toggle prompts - framework
  Reenable the unit tests for StateMachine
  Remove WiFi related methods from NetworkManagementService
  Don't pull in external/junit through mockito
  WifiConfiguration: Expose NetworkSelectionStatus strings
  Add Bluetooth toggle prompts - framework
  [NAN] Add LV utilities (TLV with T size of 0).
  [NAN] Fix TlvElement member names - reflect public access.
  TetherUtil: Use ConnectivityManager for tethering
  [NAN] TLV utilities iterator - throw correct exception
  [NAN] Modify arguments from "array, length" to "array"
  [NAN] NAN System Api: RTT
  Properly disable WiFi tethering
  [NAN] Provide inteface MAC address to app.
  [NAN] Add (T)LV validation testing
  Add IPv6 tethering coordinator
  Stop listening for WiFi interface status changes
  [NAN] Add validity checks for service name
  [NAN] Fix assumption about Strings containing single-byte characters.
  [NAN] NAN data-path API: network specifier
  DO NOT MERGE StateMachine: remove final from SendMessage
  wifi: allow config of default+verbose ring buffers
  Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime
  Add a WifiScanner API to listener for ongoing scans
  Fix invitation request from persistent GC
  SettingsBackupAgent: Remove redundant size parameter
  WifiConfiguration: Make NetworkSelectionStatus public
  Use WifiManager for wifi backup/restore
  Fix race conditions between Tethering and TetherInterfaceStateMachine
  WifiManager: Add new API to restore old backup data
  Tethering: Own WiFi tethering state and lifetime
  IpConfigStore: Changes for parsing old wifi backup
  WifiManager: Add new API's for backup/restore
  XmlUtils: Add missing readThisByteArrayXml method
  Use an ArrayMap instead of HashMap to track tether interfaces
  Consolidate cleanup logic in TetherInterfaceSM.TetheredState
  Annotate TetherInterfaceStateMachineTest for APCT
  Rely on Tethering mutex for TetherInterfaceSM
  Rename TetherInterfaceSM to TetherInterfaceStateMachine
  [NAN] Add retry count for transmitting L2 NAN messages
  Remove dead code from TetherInterfaceSM
  Remove transient StartingState from TetherInterfaceSM
  Expand test coverage of TetherInterfaceSM
  Add demonstration unittest for TetherInterfaceSM
  Extract TetherInterfaceSM to its own class.
  Make Tethering.TetherInterfaceSM more self contained
  WifiManager: add WIFI_MODE_NO_LOCKS_HELD
  Create frameworks-base-testutils lib
  Clean up class members in Tethering.TetherInterfaceSM
  Move android.net.util.IpUtilsTest into a util/ directory
  Fix trivial warnings in Tethering.java
  Fix some trivial warnings in WifiP2pDevice.java
  [NAN] Add support for NAN RTT.
  [NAN] Remove OnNanDown notification from API
  Remove unused method from NetworkManagementService
  WifiConfiguration: Add new selection disable reasons
  [NAN] Add type and nullability annotations. Update hide annotation.
  [NAN] Add master switch to enable/disable usage of NAN APIs.
  [NAN] Re-factor connect/config flow
  [NAN] Refactor session lifecycle to clarify API & eliminate race conditions
  [NAN] Removed NAN event registration - dispatch all callbacks.
  [NAN] Consolidate publish/subscribe callback sets into single set
  [NAN] Replace session callback configuration control
  [NAN] Expose match style configuration as public API.
  [NAN] API cleanup - rename FLAGS.
  [NAN] Renamed listeners to callback per API guidelines
  [NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config
  NAN: Support multiple instantiation per UID - introduce a client ID.
2016-08-29 20:03:22 +00:00
Colin Cross
649bfd3dc3 resolve merge conflicts of 5827257 to master
Change-Id: I0077b6991584fc33dcb1ca1aadb634ce930fef3a
2016-08-29 12:50:47 -07:00