OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Query geo description in worker thread to prevent ANR" am: eb7c287c71
Hall Liu [Wed, 5 Apr 2017 19:38:07 +0000 (19:38 +0000)]
Merge "Query geo description in worker thread to prevent ANR" am: eb7c287c71
am: 53d241411a

Change-Id: If224f142cf1bb77ecf8ed515250ad5c813682eb0

7 years agoMerge "Query geo description in worker thread to prevent ANR"
Hall Liu [Wed, 5 Apr 2017 19:32:07 +0000 (19:32 +0000)]
Merge "Query geo description in worker thread to prevent ANR"
am: eb7c287c71

Change-Id: I0df6d788ff5f8794e03324c3dacf337a7a04c36c

7 years agoMerge "Query geo description in worker thread to prevent ANR"
Hall Liu [Wed, 5 Apr 2017 19:23:29 +0000 (19:23 +0000)]
Merge "Query geo description in worker thread to prevent ANR"

7 years agoMerge "Add @TestApi annotations to CS-side RTT APIs for CTS" am: f6f3c16dfb
Hall Liu [Tue, 4 Apr 2017 23:45:39 +0000 (23:45 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS" am: f6f3c16dfb
am: 6689b57b66

Change-Id: I35ec391a2edcc4d64bc7330415505f700b90a568

7 years agoMerge "Add @TestApi annotations to CS-side RTT APIs for CTS"
Hall Liu [Tue, 4 Apr 2017 23:38:39 +0000 (23:38 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS"
am: f6f3c16dfb

Change-Id: I510ed2b8dfdbbb3563cd31c8630973790eae023d

7 years agoMerge "Add @TestApi annotations to CS-side RTT APIs for CTS"
Hall Liu [Tue, 4 Apr 2017 23:31:37 +0000 (23:31 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS"

7 years agoMerge "Add api to retrieve call creation time." am: f19c52d20d
Tyler Gunn [Tue, 4 Apr 2017 21:47:51 +0000 (21:47 +0000)]
Merge "Add api to retrieve call creation time." am: f19c52d20d
am: 777adc636b

Change-Id: I6de08d4ac661f097181835b16c5e20a801787814

7 years agoMerge "Add api to retrieve call creation time."
Tyler Gunn [Tue, 4 Apr 2017 21:42:14 +0000 (21:42 +0000)]
Merge "Add api to retrieve call creation time."
am: f19c52d20d

Change-Id: I42313561c2d4e612feb428f79a64c10a64bf011a

7 years agoMerge "Add api to retrieve call creation time."
Tyler Gunn [Tue, 4 Apr 2017 21:35:26 +0000 (21:35 +0000)]
Merge "Add api to retrieve call creation time."

7 years agoMerge "IMS: RTT interface changes" am: 814fdf9312
Hall Liu [Tue, 4 Apr 2017 21:31:41 +0000 (21:31 +0000)]
Merge "IMS: RTT interface changes" am: 814fdf9312
am: bc56b97770

Change-Id: Ia4f93347b8bcc668344ce78055c17a691dad4237

7 years agoMerge "IMS: RTT interface changes"
Hall Liu [Tue, 4 Apr 2017 21:28:10 +0000 (21:28 +0000)]
Merge "IMS: RTT interface changes"
am: 814fdf9312

Change-Id: Ifecb02604cebdd5ae1a16d996940d11bee920ea8

7 years agoMerge "IMS: RTT interface changes"
Hall Liu [Tue, 4 Apr 2017 21:21:16 +0000 (21:21 +0000)]
Merge "IMS: RTT interface changes"

7 years agoMerge "Protect CANCEL_HANDOVER_TRANSFER broadcast" am: 4df6c75b99
Hiroki Yamamoto [Tue, 4 Apr 2017 21:09:39 +0000 (21:09 +0000)]
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast" am: 4df6c75b99
am: d0be609210

Change-Id: I8dd81fe9b4bb71b856a023c99594568d0442837c

7 years agoMerge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
Hiroki Yamamoto [Tue, 4 Apr 2017 21:05:41 +0000 (21:05 +0000)]
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
am: 4df6c75b99

Change-Id: If1803f92474fbb6a3dc4aa47674e547443942440

7 years agoMerge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
Treehugger Robot [Tue, 4 Apr 2017 20:57:53 +0000 (20:57 +0000)]
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast"

7 years agoProtect CANCEL_HANDOVER_TRANSFER broadcast
Hiroki Yamamoto [Tue, 28 Mar 2017 02:45:13 +0000 (11:45 +0900)]
Protect CANCEL_HANDOVER_TRANSFER broadcast

Bug: 36662809
Test: cancel AndroidBeam and check if the error log is not shown
Change-Id: Ic442753aacf97f7f5a7e449685c2b1414e77e957

7 years agoMerge "Make some intents public in SubscriptionManager." am: 35e9a94dee
Sanket Padawe [Tue, 4 Apr 2017 17:06:43 +0000 (17:06 +0000)]
Merge "Make some intents public in SubscriptionManager." am: 35e9a94dee
am: c29fff5032

Change-Id: I8f9794c75009932d0b7d5893e913fbfbd7b13c37

7 years agoMerge "Make some intents public in SubscriptionManager."
Sanket Padawe [Tue, 4 Apr 2017 16:59:13 +0000 (16:59 +0000)]
Merge "Make some intents public in SubscriptionManager."
am: 35e9a94dee

Change-Id: Ic9812badf9368b1398110e446956641d27e6e2ff

7 years agoMerge "Update to latest tzdata / switch back to zones.tab" am: 44aeecc869
Neil Fuller [Tue, 4 Apr 2017 16:55:04 +0000 (16:55 +0000)]
Merge "Update to latest tzdata / switch back to zones.tab" am: 44aeecc869
am: 8c329a5895

Change-Id: Ibede804904bc280f2c75e49992d0d9c5ec99c390

7 years agoMerge "Make some intents public in SubscriptionManager."
Treehugger Robot [Tue, 4 Apr 2017 16:48:32 +0000 (16:48 +0000)]
Merge "Make some intents public in SubscriptionManager."

7 years agoMerge "Update to latest tzdata / switch back to zones.tab"
Neil Fuller [Tue, 4 Apr 2017 16:47:37 +0000 (16:47 +0000)]
Merge "Update to latest tzdata / switch back to zones.tab"
am: 44aeecc869

Change-Id: I1300ba5bbcca2d6add11ba980dcf211e8d79b4a1

7 years agoMerge "Update to latest tzdata / switch back to zones.tab"
Neil Fuller [Tue, 4 Apr 2017 16:39:56 +0000 (16:39 +0000)]
Merge "Update to latest tzdata / switch back to zones.tab"

7 years agoMerge "Make sure that the device name is not null before returning it" am: d4963e8035
Ajay Panicker [Tue, 4 Apr 2017 01:35:05 +0000 (01:35 +0000)]
Merge "Make sure that the device name is not null before returning it" am: d4963e8035
am: 87d114ac3e

Change-Id: I874a58ecc54ddd46837c6e21b6244e5bb40312d7

7 years agoMerge "Make sure that the device name is not null before returning it"
Ajay Panicker [Tue, 4 Apr 2017 01:27:41 +0000 (01:27 +0000)]
Merge "Make sure that the device name is not null before returning it"
am: d4963e8035

Change-Id: Ia9f3baa2e1c78bb1ebde2be9a412d96f76e5a225

7 years agoMerge "Make sure that the device name is not null before returning it"
Treehugger Robot [Tue, 4 Apr 2017 01:11:07 +0000 (01:11 +0000)]
Merge "Make sure that the device name is not null before returning it"

7 years agoMake some intents public in SubscriptionManager.
Sanket Padawe [Mon, 3 Apr 2017 18:17:22 +0000 (11:17 -0700)]
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

7 years agoMake sure that the device name is not null before returning it
Ajay Panicker [Mon, 3 Apr 2017 19:15:54 +0000 (12:15 -0700)]
Make sure that the device name is not null before returning it

Bug: 30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c

7 years agoMerge "Add test coverage for NetworkSpecifiers." am: 9a029b5262
Lorenzo Colitti [Mon, 3 Apr 2017 10:52:20 +0000 (10:52 +0000)]
Merge "Add test coverage for NetworkSpecifiers." am: 9a029b5262
am: 0e068f6360

Change-Id: I376b9011aaae7f0b8a2899a942d1a43e26605101

7 years agoMerge "Add test coverage for NetworkSpecifiers."
Lorenzo Colitti [Mon, 3 Apr 2017 10:45:22 +0000 (10:45 +0000)]
Merge "Add test coverage for NetworkSpecifiers."
am: 9a029b5262

Change-Id: Ia328b945af4c4f55ef560b33b00fa861b8f81b0d

7 years agoMerge "Add test coverage for NetworkSpecifiers."
Treehugger Robot [Mon, 3 Apr 2017 10:37:00 +0000 (10:37 +0000)]
Merge "Add test coverage for NetworkSpecifiers."

7 years agoMerge "ConnectivityService: simplify WakeLock management" am: c98db5caa2
Hugo Benichi [Mon, 3 Apr 2017 09:10:44 +0000 (09:10 +0000)]
Merge "ConnectivityService: simplify WakeLock management" am: c98db5caa2
am: 6db00a22b0

Change-Id: I468e31800d5cfe1dd385d773fcc393b615cfa343

7 years agoMerge "ConnectivityService: simplify WakeLock management"
Hugo Benichi [Mon, 3 Apr 2017 09:03:13 +0000 (09:03 +0000)]
Merge "ConnectivityService: simplify WakeLock management"
am: c98db5caa2

Change-Id: I1e0ae930cd7a329febf21ff3fc83ad2d0a3be69b

7 years agoMerge "ConnectivityService: simplify WakeLock management"
Hugo Benichi [Mon, 3 Apr 2017 08:56:23 +0000 (08:56 +0000)]
Merge "ConnectivityService: simplify WakeLock management"

7 years agoAdd test coverage for NetworkSpecifiers.
Lorenzo Colitti [Mon, 3 Apr 2017 08:46:35 +0000 (17:46 +0900)]
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

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Mon, 3 Apr 2017 02:18:48 +0000 (02:18 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 8f59f867f9  -s ours

Change-Id: Ief3fa9c34e3a1959e193d35cea0b0ace7168411e

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 3 Apr 2017 02:11:39 +0000 (02:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoConnectivityService: simplify WakeLock management
Hugo Benichi [Thu, 30 Mar 2017 14:18:10 +0000 (23:18 +0900)]
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

7 years agoMerge "ConnectivityService: log wakelock activity in dumps" am: db104b2367
Hugo Benichi [Sun, 2 Apr 2017 23:53:46 +0000 (23:53 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps" am: db104b2367
am: 146914c0d5

Change-Id: I4d0430a6a5b3a1f97cdc4cf9590e5b0a798ae04f

7 years agoMerge "ConnectivityService: log wakelock activity in dumps"
Hugo Benichi [Sun, 2 Apr 2017 23:47:15 +0000 (23:47 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps"
am: db104b2367

Change-Id: If08e0088ab25f1494aaf3a339a38e7a8e343d910

7 years agoMerge "ConnectivityService: log wakelock activity in dumps"
Hugo Benichi [Sun, 2 Apr 2017 23:40:25 +0000 (23:40 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps"

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 09:06:23 +0000 (09:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 2c697884a3  -s ours

Change-Id: I2e43884e9fda71b912361b12c5d26873ccd92953

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 09:05:11 +0000 (09:05 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: bcd194eb04  -s ours

Change-Id: Ide3209a7be2b5f32cced831c4bfb0f4ae8e1b278

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 09:04:04 +0000 (09:04 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 1058478d5b  -s ours

Change-Id: Ie6758133479cfb44940dc63719595362d407c61e

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 09:02:57 +0000 (09:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 69dd99c741  -s ours

Change-Id: I1eb25a2afadf68bd8a44195debb4846bca36d193

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 09:01:34 +0000 (09:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: e1a2ddeee8  -s ours

Change-Id: Ic3d74dd044e7da852eeea96744c209d3741a00d5

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 09:00:22 +0000 (09:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 45d02673c5  -s ours

Change-Id: I251062605b0d0a5ea912a510cac39ab6326f6496

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 08:59:11 +0000 (08:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ae1e284380  -s ours

Change-Id: Ibb55ea97617f1b4cff17fe66f1ff6bc1b185e4e4

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 08:57:59 +0000 (08:57 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0bbfc26ecb  -s ours

Change-Id: I8e14e844175e9d54e1249756a03b4470226a4d39

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 08:54:36 +0000 (08:54 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: f13c6c2a4c  -s ours

Change-Id: Ic6c474944a6a0a6b0a1a301f3ccd4a8e891ff073

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 08:53:18 +0000 (08:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 89a5b41395  -s ours

Change-Id: I83d95004dbb353c6b6657091845ea02358ce10bb

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 08:47:56 +0000 (08:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 4bac557350  -s ours

Change-Id: Id582294a639c1037f1f87b4f04ae2d79061e5e57

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:47:36 +0000 (08:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 08:46:47 +0000 (08:46 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 68a2d1d674  -s ours

Change-Id: I215a2d1fdcb8654739221d9b00457c9584728e17

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:44:19 +0000 (08:44 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:43:33 +0000 (08:43 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:42:52 +0000 (08:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:42:10 +0000 (08:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:41:34 +0000 (08:41 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:41:04 +0000 (08:41 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:39:42 +0000 (08:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:39:13 +0000 (08:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:38:44 +0000 (08:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:38:19 +0000 (08:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:36:16 +0000 (08:36 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 06:06:04 +0000 (23:06 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Id8d5a50ec7d04eb45dd55d333a178b9a214d05d5

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 06:02:20 +0000 (23:02 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I967ca7ee9e12c4bc83e8bd4bcf9eec0cce0ed031

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:30:30 +0000 (22:30 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I896e874391b7951f14ccb3138c21399d4dd0a6e6

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:26:48 +0000 (22:26 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I8fe57933ecbc106945b72f306cd10346e4b754a9

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:23:03 +0000 (22:23 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I6b319f5bbeccf3aeb0b8e68279add98a03389dea

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:19:25 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ib67a94c0268dbfcf32025179010422410b19157e

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:10:25 +0000 (22:10 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ic79825620336a148791f1d88e8744a8dff669b2c

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:03:48 +0000 (22:03 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I7b31b10f7d84ab10587b50e6a3d1831a3e71886b

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 04:59:53 +0000 (21:59 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I87e870cdcec90e173ab587cc65afb8841e9a6411

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 04:56:25 +0000 (21:56 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I811c247c477f0e53e060d721b7d9b9ba954f3c8b

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 04:52:56 +0000 (21:52 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I6c846a034570454310571a442fb55eec8295139b

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 04:49:26 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I3732af38b0e535528297ee18e772afd087a4c9c6

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 04:45:35 +0000 (21:45 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I4afbbdb8355c77f409d59a2ad77430ca73e49ca3

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 04:06:46 +0000 (04:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0ec174802b  -s ours

Change-Id: If10833b148ed1988bc7ff7731fe615e58c86d6c0

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 2 Apr 2017 04:01:12 +0000 (04:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ba09ef4367  -s ours

Change-Id: I3fcc1bfebb680e4f53230cc9be60b7ca4f3bacb8

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 04:00:42 +0000 (04:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 03:56:26 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge changes from topic 'ipsec-transport-impl' am: 464dc5c07e
nharold [Sun, 2 Apr 2017 00:27:38 +0000 (00:27 +0000)]
Merge changes from topic 'ipsec-transport-impl' am: 464dc5c07e
am: f983d89083

Change-Id: Ifbee28deb7bee43532b923193cade15dad4ee5b9

7 years agoIpSecManager and IpSecTransform API Cleanup am: 48b566557d
Nathan Harold [Sun, 2 Apr 2017 00:26:41 +0000 (00:26 +0000)]
IpSecManager and IpSecTransform API Cleanup am: 48b566557d
am: 5eaf5393a5

Change-Id: I30390e7341265cee055b38ba621f050e8be71f7e

7 years agoMerge changes from topic 'ipsec-transport-impl'
nharold [Sun, 2 Apr 2017 00:19:44 +0000 (00:19 +0000)]
Merge changes from topic 'ipsec-transport-impl'
am: 464dc5c07e

Change-Id: I6caf23f5fef995f1ad735ea64b99660a5180799f

7 years agoIpSecManager and IpSecTransform API Cleanup
Nathan Harold [Sun, 2 Apr 2017 00:18:42 +0000 (00:18 +0000)]
IpSecManager and IpSecTransform API Cleanup
am: 48b566557d

Change-Id: I1524f8381c8a73ba4dc7a36b343e11066b75c08d

7 years agoMerge changes from topic 'ipsec-transport-impl'
nharold [Sun, 2 Apr 2017 00:10:33 +0000 (00:10 +0000)]
Merge changes from topic 'ipsec-transport-impl'

* changes:
  Add Initial IPsec APIs to IpSecService
  IpSecManager and IpSecTransform API Cleanup

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Apr 2017 23:18:41 +0000 (16:18 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I3213f09cb1ad99844c7d745b14ccbbc1f0b4c05f

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Apr 2017 23:11:07 +0000 (16:11 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I61b5291fe0b6b1e6c421756adac398e76566ca5f

7 years agoMerge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE...
Robert Sesek [Sat, 1 Apr 2017 06:57:55 +0000 (06:57 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." am: c04b06dc81
am: 8bafcfe81c

Change-Id: I6e5b9eef6c2a6da1c3185d274afbfdec33d14a7a

7 years agoMerge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."
Robert Sesek [Sat, 1 Apr 2017 06:53:03 +0000 (06:53 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."
am: c04b06dc81

Change-Id: I781b676d273738101a6aaf27d523c7b5d7d06596

7 years agoMerge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."
Treehugger Robot [Sat, 1 Apr 2017 06:46:31 +0000 (06:46 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."

7 years agoMerge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed
Jakub Pawlowski [Sat, 1 Apr 2017 04:49:26 +0000 (04:49 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed
am: 8c5b5b0c4b

Change-Id: Iff286d35a01c180459be652de8a2670c745f49c2

7 years agoMerge "Bluetooth LE Advertising minor improvements" am: 3d84362412
Jakub Pawlowski [Sat, 1 Apr 2017 04:44:17 +0000 (04:44 +0000)]
Merge "Bluetooth LE Advertising minor improvements" am: 3d84362412
am: 821523d859

Change-Id: I1c10c8099fa6381a163eb3436ac49872399793f3

7 years agoMerge "Bluetooth 5 advertising duration refactoring (4/4)"
Jakub Pawlowski [Sat, 1 Apr 2017 04:42:45 +0000 (04:42 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)"
am: 3946df68ed

Change-Id: I04f7f867a1387d1816d007ba4bdebf9eecc66b06

7 years agoMerge "Bluetooth LE Advertising minor improvements"
Jakub Pawlowski [Sat, 1 Apr 2017 04:40:10 +0000 (04:40 +0000)]
Merge "Bluetooth LE Advertising minor improvements"
am: 3d84362412

Change-Id: Idc51a6673d8c29a22f9bed177ecb949a49480e3a

7 years agoMerge "Bluetooth 5 advertising duration refactoring (4/4)"
Jakub Pawlowski [Sat, 1 Apr 2017 04:34:50 +0000 (04:34 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)"

7 years agoBluetooth 5 advertising duration refactoring (4/4)
Jakub Pawlowski [Fri, 31 Mar 2017 02:10:08 +0000 (19:10 -0700)]
Bluetooth 5 advertising duration refactoring (4/4)

Expose both duration and maximum extended advertising events to limit
advertising time.

Test: manual
Bug: 30622771
Change-Id: I44df300995ef985526b93f8c24389775720b3432

7 years agoMerge "Bluetooth LE Advertising minor improvements"
Jakub Pawlowski [Sat, 1 Apr 2017 04:34:30 +0000 (04:34 +0000)]
Merge "Bluetooth LE Advertising minor improvements"

7 years agoBluetooth LE Advertising minor improvements
Jakub Pawlowski [Thu, 30 Mar 2017 18:19:24 +0000 (11:19 -0700)]
Bluetooth LE Advertising minor improvements

This patch adds some additional error checking for the advertising set
parameters, and some more comments.

Test: manual
Bug: 30622771
Change-Id: I87bd44f4179ef63694ad3ed656dc2acc52e40f1e

7 years agoMerge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" am...
Ajay Panicker [Sat, 1 Apr 2017 03:33:41 +0000 (03:33 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" am: 985fe4cbd2
am: 7eaf518b71

Change-Id: I9d646bf060c704a652a646f68a963a3ef6b36134