OSDN Git Service
Andrii Kulian [Tue, 30 Aug 2016 02:02:21 +0000 (02:02 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am:
128a4419e9 am:
934da4e400 am:
199d4902e2
am:
e77dfe6c74
Change-Id: I838bc3e3db325994ad640f4779e57869cff7a58f
Andrii Kulian [Tue, 30 Aug 2016 02:02:17 +0000 (02:02 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack am:
620040db3f -s ours am:
febd5c027c am:
8428bfa6e5
am:
91c0b43734
Change-Id: I361a792e1457f660c68bf74a558c4fffc3d87f71
Jason Monk [Tue, 30 Aug 2016 02:02:13 +0000 (02:02 +0000)]
Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10 am:
db2d30e1b9 am:
1a5a746fa3
am:
566f34f617
Change-Id: Ibb01c495fe7554f16ca42dad88536ecdfc1414cc
Jason Monk [Tue, 30 Aug 2016 02:02:08 +0000 (02:02 +0000)]
Fix double status bar icons am:
12124d7eca am:
447991c67a am:
9570287870
am:
5f3ddc7d6d
Change-Id: If4e6f50254c4a847a6579af6ae40a8d10f32aa90
Selim Cinek [Tue, 30 Aug 2016 01:58:33 +0000 (01:58 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev am:
4226dcef1e am:
c9c0bcf6a9 am:
df8c802677
am:
ee8d1394e3
Change-Id: I8e09eb9134050ba04192751ada2bbf7c9f1d89b2
Selim Cinek [Tue, 30 Aug 2016 01:58:20 +0000 (01:58 +0000)]
Fixed a bug where notifications could reappear am:
f3b64692a3 am:
e90d6d682e am:
ed596e6836
am:
169a18d87e
Change-Id: I2445478f1d67d668fc27a71ca33c283b78836fa4
Selim Cinek [Tue, 30 Aug 2016 01:58:12 +0000 (01:58 +0000)]
Fixed a bug where the headsup would be stuck disappearing am:
a4155bb7c0 am:
c52edb4f24 am:
b35ae808c0
am:
a17beb7869
Change-Id: I15d5a0c73b7b9c5ec8d19c43548bf85c9a638bc3
Vineeta Srivastava [Tue, 30 Aug 2016 01:58:07 +0000 (01:58 +0000)]
Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am:
24b0486cdc am:
dd51fb20f3
am:
15f24a36d5
Change-Id: I9a7d834a0841d93a7e2eef59494552fe213a0688
Vineeta Srivastava [Tue, 30 Aug 2016 01:58:03 +0000 (01:58 +0000)]
whitelist sms code for TMO-DE and TMO-MK. am:
6af315af94 am:
f4be3d2927
am:
30c49a0a1b -s ours
Change-Id: I31507c724f7f1651e1ea396323d9f9da80856ee6
Mitchell Wills [Tue, 30 Aug 2016 00:45:00 +0000 (17:45 -0700)]
DO NOT MERGE Manually merge commit '
f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
The Android Automerger [Tue, 30 Aug 2016 00:26:21 +0000 (00:26 +0000)]
Manually merge commit '
b0b6afc' into nyc-dev-plus-aosp
John Reck [Mon, 29 Aug 2016 23:53:27 +0000 (23:53 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev am:
8eaa65b867
am:
8f0de55375
Change-Id: I020fd6046f00be77eb7377d45dd3c7ca41072f72
Chris Craik [Mon, 29 Aug 2016 23:53:24 +0000 (23:53 +0000)]
Cherry pick TextureView fixes am:
2e8a8a2432
am:
dbf69818a2
Change-Id: Ia3924a4fa600611bbce966c327d563c67c5b4779
John Reck [Mon, 29 Aug 2016 23:41:25 +0000 (23:41 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev
am:
8eaa65b867
Change-Id: Ib41200ab378bce6c65a40364cf39c78a0b9942e9
Chris Craik [Mon, 29 Aug 2016 23:41:22 +0000 (23:41 +0000)]
Cherry pick TextureView fixes
am:
2e8a8a2432
Change-Id: I0f650bf2647f9141f9639a4e8875170640d78237
John Reck [Mon, 29 Aug 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev
Yohei Yukawa [Mon, 29 Aug 2016 23:00:57 +0000 (23:00 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev am:
b7efddfc41
am:
438c37a1dc
Change-Id: I3394e8f297577b80e439945425356e8e7edac227
Yohei Yukawa [Mon, 29 Aug 2016 22:55:50 +0000 (22:55 +0000)]
Make sure IME focus is synced to View focus am:
8eb07090a4
am:
87b9a88c32 -s ours
Change-Id: If98a7d876f877e7bc1c87dbaac2a21ffeea988da
Chet Haase [Mon, 29 Aug 2016 22:40:45 +0000 (22:40 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev am:
59fb472858
am:
db7f35fed6
Change-Id: I9bb129067af7cc69f3e29c6d16742ff241c1c71e
Yuichi Biwa [Mon, 29 Aug 2016 22:40:42 +0000 (22:40 +0000)]
ChooserActivity: Cannot start app that the icon overflows the layout am:
cb3e1237b5
am:
98a824dbb7
Change-Id: Ic831e45c32ccf17d577381c63bf620cd9fedf275
Chet Haase [Mon, 29 Aug 2016 22:40:38 +0000 (22:40 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am:
22e006214c
am:
c562501eb1
Change-Id: Ic838b6527d4b8e2b6bd16879d10c1ca1a2a000c8
Alan Viverette [Mon, 29 Aug 2016 22:40:34 +0000 (22:40 +0000)]
Set up view state before attaching, jump drawables if needed am:
c328f042a6
am:
01ba422091 -s ours
Change-Id: I8a8659fdb5b28449d3e14846b1bfa5b23d5ba2d3
Yohei Yukawa [Mon, 29 Aug 2016 22:40:11 +0000 (22:40 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev
am:
b7efddfc41
Change-Id: Icbef365e73d789419479143d9ce63a2476682b8e
Yohei Yukawa [Mon, 29 Aug 2016 22:40:07 +0000 (22:40 +0000)]
Make sure IME focus is synced to View focus
am:
8eb07090a4
Change-Id: Ia0db5adc86c72f122a5b9bab91962ffa2923469a
TreeHugger Robot [Mon, 29 Aug 2016 22:35:21 +0000 (22:35 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:29:20 +0000 (22:29 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev am:
a1bbb76806
am:
df46861131
Change-Id: Id48220d390d847fcdfa5f844bfe7b3567eddcbda
Adam Powell [Mon, 29 Aug 2016 22:29:18 +0000 (22:29 +0000)]
Force AlertDialogLayout to have gravity start|top am:
00c4f7ba65
am:
426750d9c6
Change-Id: Icb4b911f82aba87f587be444431417eb88c03988
Chet Haase [Mon, 29 Aug 2016 22:29:15 +0000 (22:29 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev am:
c80a4d7ae3
am:
55c66ce844
Change-Id: If5826fb63eb41f79aa9b3d4f3ad94610b08247e2
Abodunrinwa Toki [Mon, 29 Aug 2016 22:29:11 +0000 (22:29 +0000)]
FloatingActionMode: Fix screen coordinates. am:
99c340cad9
am:
6507b8b333
Change-Id: I76310131e709a38eb014628c6f52c617348a2a30
Chet Haase [Mon, 29 Aug 2016 22:18:55 +0000 (22:18 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
am:
59fb472858
Change-Id: I257ec5926d5261fd508f91e5a60911aa752f4b48
Yuichi Biwa [Mon, 29 Aug 2016 22:18:46 +0000 (22:18 +0000)]
ChooserActivity: Cannot start app that the icon overflows the layout
am:
cb3e1237b5
Change-Id: I066aa6f03ea3c45fa1330556bc3a6db29ab48262
Chet Haase [Mon, 29 Aug 2016 22:18:34 +0000 (22:18 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
am:
22e006214c
Change-Id: I8645ac4cf4cd398f74d77b62b9060a72a87a5411
Alan Viverette [Mon, 29 Aug 2016 22:18:28 +0000 (22:18 +0000)]
Set up view state before attaching, jump drawables if needed
am:
c328f042a6
Change-Id: Ie3df4a2e889577a7a64adc1fff4d773529da0d61
Chet Haase [Mon, 29 Aug 2016 22:18:19 +0000 (22:18 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
am:
a1bbb76806
Change-Id: I3bff93e0181b2e517a2cff6a00f9d205940f0da7
Adam Powell [Mon, 29 Aug 2016 22:18:15 +0000 (22:18 +0000)]
Force AlertDialogLayout to have gravity start|top
am:
00c4f7ba65
Change-Id: I268264e198ccb0d8394da68899406b96aaf5cb39
Chet Haase [Mon, 29 Aug 2016 22:18:11 +0000 (22:18 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev
am:
c80a4d7ae3
Change-Id: I72854a21958ca35bd94166fb2058f4fa38c11a87
Abodunrinwa Toki [Mon, 29 Aug 2016 22:18:07 +0000 (22:18 +0000)]
FloatingActionMode: Fix screen coordinates.
am:
99c340cad9
Change-Id: I73ff6d1b3bed01d7738634c67a6f6d1a2e755da1
Chet Haase [Mon, 29 Aug 2016 22:13:09 +0000 (22:13 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:12:07 +0000 (22:12 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:11:25 +0000 (22:11 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:11:07 +0000 (22:11 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev
Christopher Tate [Mon, 29 Aug 2016 22:02:34 +0000 (22:02 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev am:
2bbfe98062
am:
ea14c09012
Change-Id: Idf9669dbc5c9365a735f68ae3d53c29d69ce11a6
Christopher Tate [Mon, 29 Aug 2016 22:02:31 +0000 (22:02 +0000)]
Eliminate next-alarm-clock broadcast flapping am:
c60da1edc1
am:
b593999965
Change-Id: I92c0e8148ff3011a4183fc46f3304c09463887f0
Christopher Tate [Mon, 29 Aug 2016 21:56:03 +0000 (21:56 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
am:
2bbfe98062
Change-Id: I30577f5760dabfc39faa117a9c9f8939b9cad49d
Christopher Tate [Mon, 29 Aug 2016 21:55:53 +0000 (21:55 +0000)]
Eliminate next-alarm-clock broadcast flapping
am:
c60da1edc1
Change-Id: I011c1ca4d3d0620d2c8c41b96422568bdc5fda31
TreeHugger Robot [Mon, 29 Aug 2016 21:47:02 +0000 (21:47 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
Andrii Kulian [Mon, 29 Aug 2016 21:38:46 +0000 (21:38 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev am:
c8417676ed
am:
bdbf13e989
Change-Id: Ic824f161e9ded02999be463b2d9fb0dc42026a8d
Andrii Kulian [Mon, 29 Aug 2016 21:38:44 +0000 (21:38 +0000)]
DO NOT MERGE -- Fix finishing activity in non-focused stack am:
772c598f66
am:
3701296a70
Change-Id: I538137e37e0fa738201c953d9590cc96115313d7
Chris Craik [Mon, 25 Jul 2016 22:29:59 +0000 (15:29 -0700)]
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
391d560402c2902e0fd701f99eabd91025154201)
TextureView: destroy layer on destroyHardwareResources event
bug:
30468770
(cherry picked from commit
1c16c37d8646ed25e844af8472eede988ad0c2f0)
Fix NPE in TextureView
Bug:
30651595
(cherry picked from commit
3c2587f26eed32a8723488131d1d8940dc147ee1)
Fix NPE in TextureView
Bug:
30779663
(cherry picked from commit
7e237189c292cdb886733eb95c6069b7ac002527)
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
03df0834e63b587dbfb8fdcd0086e3e1e72b9f9d)
Andrii Kulian [Mon, 29 Aug 2016 21:17:02 +0000 (21:17 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
am:
c8417676ed
Change-Id: Id80f837166f392e6490a09cfb22d1b748e19b5f5
Andrii Kulian [Mon, 29 Aug 2016 21:16:58 +0000 (21:16 +0000)]
DO NOT MERGE -- Fix finishing activity in non-focused stack
am:
772c598f66
Change-Id: I6d5a62f4d19bb1043a117b4d5a085152bed45200
TreeHugger Robot [Mon, 29 Aug 2016 21:10:31 +0000 (21:10 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
Mitchell Wills [Mon, 29 Aug 2016 20:02:48 +0000 (20:02 +0000)]
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.
Tao Bao [Mon, 29 Aug 2016 19:48:41 +0000 (19:48 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4 am:
c5a17fc39f
am:
8c682f8441
Change-Id: I5002fd9efaaefcd63f25dcddc8e4603d6280b46b
Christopher Tate [Wed, 3 Aug 2016 21:57:47 +0000 (14:57 -0700)]
Eliminate next-alarm-clock broadcast flapping
When multiple alarm clocks are scheduled at the same time, we would
flap among the alternatives for considering them the 'next upcoming
alarm clock', which in turn would generate [many] spurious broadcasts
about changes to the upcoming alarm situation. This is now fixed;
once we have found the soonest upcoming alarm clock, we stick with
that one until it becomes unavailable, eliminating the spurious
broadcast traffic.
Bug
29501073
Change-Id: Ice1892490bb339e05fa8bd9d324fa1c6718b4942
(cherry picked from commit
76389c00d3d3ce79e48d9e87b597707ed3e8970c)
Tao Bao [Mon, 29 Aug 2016 19:33:29 +0000 (19:33 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4
am:
c5a17fc39f
Change-Id: Ie634af4f18044ffaf98c21149c1635b6ad8b9a3f
Tao Bao [Mon, 29 Aug 2016 19:26:43 +0000 (19:26 +0000)]
Bump up the uncrypt timeout to 30 min.
am:
8abcfed8a4
Change-Id: I35340614fe09f96f8c31cc53a99e366580294490
Felipe Leme [Mon, 29 Aug 2016 19:25:02 +0000 (19:25 +0000)]
Merge "Fixed statuses on Battery Saver column." am:
21e0701f76 am:
bb205d5e3e
am:
6a1dd43194
Change-Id: Ia8e0bc64185f6ddb2874f266b125740537bd73cd
Andrii Kulian [Mon, 29 Aug 2016 19:24:59 +0000 (19:24 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am:
128a4419e9
am:
819de103db
Change-Id: I63f8b3f16e74044923112444380e580c34d997e9
Andrii Kulian [Mon, 29 Aug 2016 19:24:57 +0000 (19:24 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack am:
620040db3f
am:
d1fb246dad -s ours
Change-Id: Id36d853d58dd0cb91192511fab8e6863b1c87325
Andrii Kulian [Mon, 29 Aug 2016 19:05:59 +0000 (19:05 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am:
128a4419e9 am:
934da4e400
am:
199d4902e2
Change-Id: I3c14b9567284d65dcb4427895fdc18886ad9929e
Andrii Kulian [Mon, 29 Aug 2016 19:01:18 +0000 (19:01 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack am:
620040db3f -s ours am:
febd5c027c
am:
8428bfa6e5
Change-Id: I1f0b8af301e19a934c7c2b8e71374e3d89490cd2
Andrii Kulian [Mon, 29 Aug 2016 19:01:16 +0000 (19:01 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am:
128a4419e9
am:
934da4e400
Change-Id: I9b8c06e89ce182b4fb47a74aaea3d501267add84
Felipe Leme [Mon, 29 Aug 2016 18:55:32 +0000 (18:55 +0000)]
Merge "Fixed statuses on Battery Saver column." am:
21e0701f76
am:
bb205d5e3e
Change-Id: I3c4e517b25b9e1c709baa11fe8568a8efecafea9
Andrii Kulian [Mon, 29 Aug 2016 18:51:55 +0000 (18:51 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am:
128a4419e9
Change-Id: I6c28db82c53af5a68c3d875ecca920b9a1364b32
Andrii Kulian [Mon, 29 Aug 2016 18:51:53 +0000 (18:51 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack am:
620040db3f -s ours
am:
febd5c027c
Change-Id: I658d45b3149128876240e41bbd16ad35951c6dfa
Felipe Leme [Mon, 29 Aug 2016 18:44:28 +0000 (18:44 +0000)]
Merge "Fixed statuses on Battery Saver column."
am:
21e0701f76
Change-Id: I4125ff3ad049ef2717fe12ba7ca62d99bf9bd3c5
Andrii Kulian [Mon, 29 Aug 2016 18:44:15 +0000 (18:44 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am:
128a4419e9
Change-Id: I86073e914c30743355c3dab7e6520c5a00eb5001
Andrii Kulian [Mon, 29 Aug 2016 18:44:12 +0000 (18:44 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack
am:
620040db3f
Change-Id: If7adc0d548380cfe397bbdd9469b818861583e0c
Andrii Kulian [Mon, 29 Aug 2016 18:44:11 +0000 (18:44 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack
am:
620040db3f -s ours
Change-Id: I62703cc7f62bf42967021ce8defa30669e096ec2
Jason Monk [Mon, 29 Aug 2016 18:43:19 +0000 (18:43 +0000)]
Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10 am:
db2d30e1b9
am:
1a5a746fa3
Change-Id: I6c3c1fc27c3f851b27d6036225a8c410b9972517
Jason Monk [Mon, 29 Aug 2016 18:43:17 +0000 (18:43 +0000)]
Fix double status bar icons am:
12124d7eca am:
447991c67a
am:
9570287870
Change-Id: I29d3319ab271e1dd42f7af15f917f97619972cd5
Selim Cinek [Mon, 29 Aug 2016 18:43:14 +0000 (18:43 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev am:
4226dcef1e am:
c9c0bcf6a9
am:
df8c802677
Change-Id: I3596b2d9182a967896b122c653b5a42c713838aa
Selim Cinek [Mon, 29 Aug 2016 18:43:11 +0000 (18:43 +0000)]
Fixed a bug where notifications could reappear am:
f3b64692a3 am:
e90d6d682e
am:
ed596e6836
Change-Id: I430e38bcba8b741fe2b43c5dba6f1d2a3f38d5a0
Selim Cinek [Mon, 29 Aug 2016 18:43:07 +0000 (18:43 +0000)]
Fixed a bug where the headsup would be stuck disappearing am:
a4155bb7c0 am:
c52edb4f24
am:
b35ae808c0
Change-Id: If4057d8e392d19ba62f9365788628922b02d9173
Vineeta Srivastava [Mon, 29 Aug 2016 18:34:03 +0000 (18:34 +0000)]
Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am:
24b0486cdc
am:
dd51fb20f3
Change-Id: I1189b69e2b38f36c805198e9dba105df4364f9e8
Vineeta Srivastava [Mon, 29 Aug 2016 18:33:56 +0000 (18:33 +0000)]
whitelist sms code for TMO-DE and TMO-MK. am:
6af315af94
am:
f4be3d2927
Change-Id: I75b17dff3fa7b255adb7ce7d705a2d65c1ad5347
Jason Monk [Mon, 29 Aug 2016 18:33:04 +0000 (18:33 +0000)]
Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10
am:
67566858af
Change-Id: I52d32ec39c5f6d8923b08d05d864c7f010b3562f
Jason Monk [Mon, 29 Aug 2016 18:32:57 +0000 (18:32 +0000)]
Fix double status bar icons am:
12124d7eca
am:
829548a3cb
Change-Id: Ieeb5792253ef05bf8a4d41aa1074a613c012626c
Jason Monk [Mon, 29 Aug 2016 18:32:39 +0000 (18:32 +0000)]
Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10
am:
db2d30e1b9
Change-Id: I707e1f8457e826d2d5b83ccc21668e5a786b28eb
Jason Monk [Mon, 29 Aug 2016 18:32:37 +0000 (18:32 +0000)]
Fix double status bar icons am:
12124d7eca
am:
447991c67a
Change-Id: Ic0a217f292dcf4a7d9b2b47c4d32438b436a77ad
Selim Cinek [Mon, 29 Aug 2016 18:32:35 +0000 (18:32 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev am:
4226dcef1e
am:
c9c0bcf6a9
Change-Id: Ib517c495cd53a5ea0f14bb443b74d69d2efe8429
Selim Cinek [Mon, 29 Aug 2016 18:32:33 +0000 (18:32 +0000)]
Fixed a bug where notifications could reappear am:
f3b64692a3
am:
e90d6d682e
Change-Id: Ie08bd37033cd81ff0898a6766bd505e0f597d7fe
Selim Cinek [Mon, 29 Aug 2016 18:32:31 +0000 (18:32 +0000)]
Fixed a bug where the headsup would be stuck disappearing am:
a4155bb7c0
am:
c52edb4f24
Change-Id: I94084878dec7952607572d3005a160cc74eb2a62
Felipe Leme [Mon, 29 Aug 2016 18:32:27 +0000 (18:32 +0000)]
Merge "Fixed statuses on Battery Saver column."
Andrii Kulian [Fri, 29 Jul 2016 19:55:41 +0000 (12:55 -0700)]
DO NOT MERGE -- Fix finishing activity in non-focused stack
This CL explicitly checks if we're finishing activity in non-focused
stack as there are other cases except this one when we finish paused
activities in FINISH_AFTER_VISIBLE mode.
Bug:
29007436
Bug:
29458854
Change-Id: I67744d23cd72f2fe8861180008bfdd284a7b5e26
(cherry picked from commit
995fa2bd2d334a37e10760c21ac108f4a3595713)
Andrii Kulian [Mon, 29 Aug 2016 18:30:06 +0000 (18:30 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
Felipe Leme [Thu, 14 Jul 2016 18:04:49 +0000 (11:04 -0700)]
Fixed statuses on Battery Saver column.
BUG:
30139400
Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd
(cherry picked from commit
9e325706f42a1dc48abe80a24323fae4579ab033)
Roshan Pius [Fri, 26 Aug 2016 02:47:06 +0000 (19:47 -0700)]
NetworkSelectionStatus: Fix copy constructor
Add couple of missing elements in the NetworkSelectionStatus copy constructor.
BUG:
31102798
Change-Id: Ie5f3719b94acf021d4ae2756afd635388640168c
(cherry picked from commit
699680b6b4fb923e4129d678013e3fbbc0421eaa)
Randy Pan [Wed, 27 Jul 2016 20:20:51 +0000 (13:20 -0700)]
Deprecate QNS network disable reason BAD_LINK
WifiNetworkAgent#unwanted no longer disables the network.
Bug:
28558417
Change-Id: I2e7ed99ae4cb952f124c673376d967eeee2b4ece
(cherry picked from commit
4156d615707a7aa27ecaf55c889824fd025a75b5)
Etan Cohen [Mon, 22 Aug 2016 18:27:57 +0000 (11:27 -0700)]
[NAN] API changes/fixes addressing apilint issues
Bug:
30983968
Change-Id: I2189442755380ad5d04f80bcb5978ca0c28e6420
(cherry picked from commit
9825309424cab3a3efabac0bde79b3c1419f9be9)
Etan Cohen [Thu, 18 Aug 2016 23:51:50 +0000 (16:51 -0700)]
[NAN] Add method to ConfigRequest to determine if non-default
To be used in permission check.
Bug:
27696149
Change-Id: I5be5aed93c556cf24b596bd2a7c5672502f84d74
(cherry picked from commit
8266b3f876e6b96ac0f18216b2011b03a0504a23)
Etan Cohen [Thu, 18 Aug 2016 22:38:29 +0000 (15:38 -0700)]
[NAN] Simplify publish/subscribe configuration - merge match filters
Merge Tx/Rx match filters into single Match filter configuration. Only
a single filter can be used at a time (either Tx or Rx).
Bug:
30948496
Change-Id: I32a9a0306dfd08295bc63145bccfe3739862f17d
(cherry picked from commit
6007681b19510d2a739ab45c1754d869f8f15e72)
Etan Cohen [Thu, 18 Aug 2016 16:55:31 +0000 (09:55 -0700)]
[NAN] Udpate NAN API documentation, clean-up visibility
Change-Id: I951340eebab35c10efe98dab86b58fe8efada169
(cherry picked from commit
2e37b06dde2dff019b9143fc6b61021dab79bda3)
Etan Cohen [Tue, 19 Apr 2016 17:55:56 +0000 (10:55 -0700)]
[NAN] Do not expose WifiManager.isNanSupported as new API
The WifiManager.isXxxSupported() only functions if HAL is enabled
and seems to be a duplicate of:
PackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_NAN)
Bug:
28251988
Change-Id: I8f410def6f0bd3d3fc0926072ab66acce52a0e14
(cherry picked from commit
a3264c4e3d08d38b08ab0c1c92341cb9cc8f29f8)
Etan Cohen [Thu, 11 Aug 2016 21:23:23 +0000 (14:23 -0700)]
[NAN] Update finalize to check and warn user if resources not freed
Use CloseGuard to check that disconnect() is called to free the resources
allocated by connect(). finalize() will still call disconnect() but now
also print out errors (if StrictMode enabled for feature).
Bug:
28068773
Change-Id: I5f5847c0261ef9f79a21fdb935509a85761591cc
(cherry picked from commit
9d55649613f6ea9926c6e6222965178e91cb501b)
Etan Cohen [Tue, 16 Aug 2016 18:54:49 +0000 (11:54 -0700)]
[NAN] Fix bad merge use rethrowFromSystemServer
Added 'throw' to the 'e.rethrowXXX()'. Not needed but seems
to be the accepted style.
Change-Id: I75e42d68ee6092699a55e26ee05151373139606d
(cherry picked from commit
cb34ec8f3a8dd40f7c49181b008de7314735ca66)
Mitchell Wills [Thu, 11 Aug 2016 18:05:03 +0000 (11:05 -0700)]
Add Log.wtf when transitionTo is used improperly
Using transitionTo in exit/enter (except in the terminal state) is
documented as undefined behavior and may cause unexpected results.
The current implementation appears to finish the current transition and
then transition to the new target state.
TEST=flash and play with the phone, no sign of immediate WTFs
Change-Id: I38a34b85c43d53c51514339587fc1269a069a454
(cherry picked from commit
8d3ed21583a8d83047cee1735cf669e131809e73)
Mitchell Wills [Wed, 10 Aug 2016 20:49:21 +0000 (13:49 -0700)]
Ensure BSSIDs are correctly aged out in settings view
When verbose logging is on, recent BSSIDs are displayed under the
network. This ensures that the BSSIDs are aged out after a period of
time instead of based on a fixed size LRU cache. This prevents BSSIDs
that are no longer present from appearing in the results.
FIXED=
30711015
TEST=setup two APs, observe both BSSIDs in settings, turn off one,
observe it disappearing after a short period of time.
Change-Id: Id2b2ccd0899eae8d4e2e1c2b3ae9409136a8c948
(cherry picked from commit
b744d6e865e4141cd19cdf279f75f30c3d6590af)
Etan Cohen [Thu, 11 Aug 2016 16:31:21 +0000 (09:31 -0700)]
[NAN] Provide calling package name to service
Useful for permission checks.
Bug:
30000323
Change-Id: I8c7f06cff346437aa24ca5da9822cbd7b20c59c4
(cherry picked from commit
7531a28e2611039a8120305c14a96b8c61fff563)