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

284459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugo Benichi
2183ba9b5f Nsdmanager/NsdService: add logging 
This patch adds basic logging to NsdManager and NsdService, and improves
the facilities for pretty printing the event ids defined in NsdManager.

It also includes a few minor cleanups:
  - adding 'final' on effectively final instance variables of NsdManager
  and NsdService.
  - similarly, adding 'static' on effectively static class fields.
  - regrouping instance variables together.

Test: no functional changes
Bug: 33074219
Change-Id: I360d539e73cc8e4b45d4e0d20b2e345455fdb10c
 2017-04-05 15:05:44 +09:00
Hall Liu
6689b57b66 Merge "Add @TestApi annotations to CS-side RTT APIs for CTS" 
am: f6f3c16dfb

Change-Id: I510ed2b8dfdbbb3563cd31c8630973790eae023d
 2017-04-04 23:38:39 +00:00
Hall Liu
f6f3c16dfb Merge "Add @TestApi annotations to CS-side RTT APIs for CTS" 2017-04-04 23:31:38 +00:00
Ajay Nambi
eca5ebb075 Add p2 option in openLogicalChannel. 
- Add support for iccOpenLogicalChannelWithP2.
- Needed to support OMAPI 3.0 defined
by SIM Alliance.
- Deprecate iccOpenLogicalChannel(String) API and
pass down an invalid p2 value to keep original behavior

Bug: 27360148
Change-Id: I2ab6cfb7a54c451f32936df51b8298f35a6dc67f
 2017-04-04 22:08:02 +00:00
Tyler Gunn
777adc636b Merge "Add api to retrieve call creation time." 
am: f19c52d20d

Change-Id: I42313561c2d4e612feb428f79a64c10a64bf011a
 2017-04-04 21:42:14 +00:00
Tyler Gunn
f19c52d20d Merge "Add api to retrieve call creation time." 2017-04-04 21:35:26 +00:00
Hall Liu
bc56b97770 Merge "IMS: RTT interface changes" 
am: 814fdf9312

Change-Id: Ifecb02604cebdd5ae1a16d996940d11bee920ea8
 2017-04-04 21:28:10 +00:00
Hall Liu
814fdf9312 Merge "IMS: RTT interface changes" 2017-04-04 21:21:17 +00:00
Hiroki Yamamoto
d0be609210 Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast" 
am: 4df6c75b99

Change-Id: If1803f92474fbb6a3dc4aa47674e547443942440
 2017-04-04 21:05:41 +00:00
Treehugger Robot
4df6c75b99 Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast" 2017-04-04 20:57:53 +00:00
Hiroki Yamamoto
57a5145a01 Protect CANCEL_HANDOVER_TRANSFER broadcast 
Bug: 36662809
Test: cancel AndroidBeam and check if the error log is not shown
Change-Id: Ic442753aacf97f7f5a7e449685c2b1414e77e957
 2017-04-04 20:56:36 +00:00
Sanket Padawe
c29fff5032 Merge "Make some intents public in SubscriptionManager." 
am: 35e9a94dee

Change-Id: Ic9812badf9368b1398110e446956641d27e6e2ff
 2017-04-04 16:59:13 +00:00
Treehugger Robot
35e9a94dee Merge "Make some intents public in SubscriptionManager." 2017-04-04 16:48:33 +00:00
Neil Fuller
8c329a5895 Merge "Update to latest tzdata / switch back to zones.tab" 
am: 44aeecc869

Change-Id: I1300ba5bbcca2d6add11ba980dcf211e8d79b4a1
 2017-04-04 16:47:37 +00:00
Neil Fuller
44aeecc869 Merge "Update to latest tzdata / switch back to zones.tab" 2017-04-04 16:39:58 +00:00
Ajay Panicker
87d114ac3e Merge "Make sure that the device name is not null before returning it" 
am: d4963e8035

Change-Id: Ia9f3baa2e1c78bb1ebde2be9a412d96f76e5a225
 2017-04-04 01:27:41 +00:00
Treehugger Robot
d4963e8035 Merge "Make sure that the device name is not null before returning it" 2017-04-04 01:11:08 +00:00
Sanket Padawe
e4f5f79c65 Make some intents public in SubscriptionManager. 
+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
Merged-in: Ibb1d1faae9a002ccb530446e24897955c12076e1
 2017-04-03 15:53:05 -07:00
Ajay Panicker
c2c4efd137 Make sure that the device name is not null before returning it 
Bug: 30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c
 2017-04-03 20:21:14 +00:00
Lorenzo Colitti
0e068f6360 Merge "Add test coverage for NetworkSpecifiers." 
am: 9a029b5262

Change-Id: Ia328b945af4c4f55ef560b33b00fa861b8f81b0d
 2017-04-03 10:45:22 +00:00
Treehugger Robot
9a029b5262 Merge "Add test coverage for NetworkSpecifiers." 2017-04-03 10:37:01 +00:00
Hugo Benichi
6db00a22b0 Merge "ConnectivityService: simplify WakeLock management" 
am: c98db5caa2

Change-Id: I1e0ae930cd7a329febf21ff3fc83ad2d0a3be69b
 2017-04-03 09:03:13 +00:00
Hugo Benichi
c98db5caa2 Merge "ConnectivityService: simplify WakeLock management" 2017-04-03 08:56:24 +00:00
Lorenzo Colitti
6556a220d7 Add test coverage for NetworkSpecifiers. 
Tests various combinations of empty / non-empty NetworkSpecifiers
and changing specifiers on the fly.

Test: ConnectivityServiceTest passes
Bug: 27533960
Change-Id: Ibd6b4efc861dc51689e46f3882ba859223411bf0
 2017-04-03 17:46:35 +09:00
TreeHugger Robot
8f59f867f9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-03 02:11:44 +00:00
Hugo Benichi
4c31b34d16 ConnectivityService: simplify WakeLock management 
This patch simplifies wakelock management by acknowledging that only one
acquisition at most is in flight at any time. This allows to remove the
serial number associated with wakelock acquisition and to avoid double
release when regaining a default network.

Example of $ adb shell dumpsys connectivity logs:
  NetTransition WakeLock activity (most recent first):
    03-31 00:15:13.816 - RELEASE (EVENT_CLEAR_NET_TRANSITION_WAKELOCK)
    03-31 00:14:59.216 - ACQUIRE for NetworkAgentInfo [WIFI () - 101]
    03-31 00:09:05.799 - RELEASE (EVENT_EXPIRE_NET_TRANSITION_WAKELOCK)
    03-31 00:08:05.738 - ACQUIRE for NetworkAgentInfo [WIFI () - 100]

Test: watched wakelock section $ adb shell dumpsys connectivity while
      turning on and off Wifi (with no other network).
Bug: 36703718
Change-Id: I899b0816c0e41b3991d9540e9b9a604914ff673a
 2017-04-03 08:54:54 +09:00
Hugo Benichi
146914c0d5 Merge "ConnectivityService: log wakelock activity in dumps" 
am: db104b2367

Change-Id: If08e0088ab25f1494aaf3a339a38e7a8e343d910
 2017-04-02 23:47:15 +00:00
Hugo Benichi
db104b2367 Merge "ConnectivityService: log wakelock activity in dumps" 2017-04-02 23:40:27 +00:00
TreeHugger Robot
2c697884a3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:47:41 +00:00
TreeHugger Robot
bcd194eb04 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:44:23 +00:00
TreeHugger Robot
1058478d5b Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:43:38 +00:00
TreeHugger Robot
69dd99c741 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:42:58 +00:00
TreeHugger Robot
e1a2ddeee8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:42:16 +00:00
TreeHugger Robot
45d02673c5 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:41:39 +00:00
TreeHugger Robot
ae1e284380 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:41:09 +00:00
TreeHugger Robot
0bbfc26ecb Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:39:48 +00:00
TreeHugger Robot
f13c6c2a4c Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:39:18 +00:00
TreeHugger Robot
89a5b41395 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:38:49 +00:00
TreeHugger Robot
4bac557350 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:38:25 +00:00
TreeHugger Robot
68a2d1d674 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:36:21 +00:00
Bill Yi
199c7eef87 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Id8d5a50ec7d04eb45dd55d333a178b9a214d05d5
 2017-04-01 23:06:04 -07:00
Bill Yi
6bd43afc95 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I967ca7ee9e12c4bc83e8bd4bcf9eec0cce0ed031
 2017-04-01 23:02:20 -07:00
Bill Yi
01a086c264 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I896e874391b7951f14ccb3138c21399d4dd0a6e6
 2017-04-01 22:30:30 -07:00
Bill Yi
9b255d0469 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I8fe57933ecbc106945b72f306cd10346e4b754a9
 2017-04-01 22:26:48 -07:00
Bill Yi
88dcda2258 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I6b319f5bbeccf3aeb0b8e68279add98a03389dea
 2017-04-01 22:23:03 -07:00
Bill Yi
8e2343f9fb Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ib67a94c0268dbfcf32025179010422410b19157e
 2017-04-01 22:19:25 -07:00
Bill Yi
e3543a8066 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ic79825620336a148791f1d88e8744a8dff669b2c
 2017-04-01 22:10:25 -07:00
Bill Yi
15a6c01404 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I7b31b10f7d84ab10587b50e6a3d1831a3e71886b
 2017-04-01 22:03:48 -07:00
Bill Yi
1a83f7e3b0 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I87e870cdcec90e173ab587cc65afb8841e9a6411
 2017-04-01 21:59:53 -07:00
Bill Yi
42ddc05e1f Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I811c247c477f0e53e060d721b7d9b9ba954f3c8b
 2017-04-01 21:56:25 -07:00