Commit Graph

326202 Commits

Author SHA1 Message Date
Hemant Gupta
afc9832a1d OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
am: e2ac2e20d6

Change-Id: I4641c8bc03d0886d614165ac3c0fd42721c5a046
2017-06-09 21:06:09 +00:00
Android Build Merger (Role)
51fb4488f5 Merge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am: 49444fc090 -s ours" into oc-dr1-dev-plus-aosp 2017-06-09 21:02:51 +00:00
Hemant Gupta
3f6bb65808 OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
am: b99484cc61

Change-Id: I701377a315a73eb918f8e42129a401072733cb71
2017-06-09 21:00:03 +00:00
Jordan Liu
03d85e51b1 Merge "Add IApnSourceService.aidl" into oc-dr1-dev
am: 49444fc090  -s ours

Change-Id: Id3b02a2cbcbcaa1bda5cf3515f9b33642afdb96d
2017-06-09 20:59:54 +00:00
Hemant Gupta
e2ac2e20d6 OBEX: Add required parameters TAG ID's for PBAP 1.2
am: 6f2b75f574

Change-Id: I8dce42c762758a5ab2ca09b92301697af4d29a8a
2017-06-09 20:57:41 +00:00
TreeHugger Robot
49444fc090 Merge "Add IApnSourceService.aidl" into oc-dr1-dev 2017-06-09 20:54:25 +00:00
Hemant Gupta
b99484cc61 OBEX: Add required parameters TAG ID's for PBAP 1.2
am: 6f2b75f574

Change-Id: I9110d7fd8b687f3ee59e3d9ea5ef3319873cdf69
2017-06-09 20:50:16 +00:00
Jeff Sharkey
00c66f676f Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
am: c017d299ce

Change-Id: I57a4f793614c12f32a5e0b8cafa98ef914f2501c
2017-06-09 20:29:11 +00:00
Jeff Sharkey
c017d299ce Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev 2017-06-09 20:23:23 +00:00
Jordan Liu
da7fe3f117 Merge "Add IApnSourceService.aidl" am: 1d5d409f6f am: 7b78a176a9
am: b699e98285

Change-Id: Ib0d3d447d6058cbc6e348f76e55429627a917591
2017-06-09 19:13:20 +00:00
Jordan Liu
b699e98285 Merge "Add IApnSourceService.aidl" am: 1d5d409f6f
am: 7b78a176a9

Change-Id: I8fd54598aae183364ba44a0d5ca2f4331436292a
2017-06-09 19:04:48 +00:00
Hemant Gupta
6f2b75f574 OBEX: Add required parameters TAG ID's for PBAP 1.2
Add required OBEX application parameters TAGID's and length
declarations required to support PBAP 1.2 specification.

Test: Connected with Remote PBAP Client supporting PBAP 1.2 and
      verified that connection and transfer happens over L2CAP.
      Connected with Remote PBAP Client supporting PBAP 1.1 and
      and verified that connection and transfer happens over RFCOMM.
      TestTracker: 89053
Bug: 33011817
Change-Id: I8a772b0dddf6ecf74b057e12d7596421c0e0f558
(cherry picked from commit 9e91b62c1f)
2017-06-09 18:21:56 +00:00
Android Build Merger (Role)
70bc6258fd Merge "Merge "Removing legacy default thumbnail logic." into oc-dev am: a0e44e7335 am: fc926a938e" into oc-dr1-dev-plus-aosp 2017-06-09 18:05:00 +00:00
Winson Chung
8eb69e906c Merge "Removing legacy default thumbnail logic." into oc-dev am: a0e44e7335
am: fc926a938e

Change-Id: I7a59633e9850083816c2dbdaffcc50b7908fa80d
2017-06-09 18:03:04 +00:00
Winson Chung
81ca14d751 Merge "Removing legacy default thumbnail logic." into oc-dev am: a0e44e7335
am: d6e3001770

Change-Id: I9b7572f08a3b67bf886aa06d02e00a960529aa9b
2017-06-09 18:02:03 +00:00
Winson Chung
fc926a938e Merge "Removing legacy default thumbnail logic." into oc-dev
am: a0e44e7335

Change-Id: I5bcc319b92c464c28ff4db6c94cf297e786b50d7
2017-06-09 17:56:26 +00:00
Winson Chung
d6e3001770 Merge "Removing legacy default thumbnail logic." into oc-dev
am: a0e44e7335

Change-Id: I39c832f1ff5b0905bb497c3970c4ce40dad237b8
2017-06-09 17:55:08 +00:00
Lei Yu
35aa7879be Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev
am: 02ece2f486

Change-Id: I395712265d3d159c26c4f69f2a7abdfe31398aff
2017-06-09 17:52:41 +00:00
Winson Chung
a0e44e7335 Merge "Removing legacy default thumbnail logic." into oc-dev 2017-06-09 17:50:50 +00:00
Android Build Merger (Role)
0d62772fa8 Merge "Merge "Replace fonts of unknown origin" into oc-dev am: 3eae564fec am: e9261d2b84" into oc-dr1-dev-plus-aosp 2017-06-09 17:49:25 +00:00
Clara Bayarri
740ac77057 Merge "Replace fonts of unknown origin" into oc-dev am: 3eae564fec
am: e9261d2b84

Change-Id: Id70541af980dd26e2d5d3cb80f87690e6b50e717
2017-06-09 17:47:03 +00:00
Lei Yu
02ece2f486 Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev 2017-06-09 17:46:33 +00:00
Clara Bayarri
f26d11f169 Merge "Replace fonts of unknown origin" into oc-dev am: 3eae564fec
am: f93c97f73e

Change-Id: I600bc887488ddba6500c9be170f524e67fd15d62
2017-06-09 17:46:31 +00:00
Jordan Liu
6d783e3529 Add IApnSourceService.aidl
This service is bound to by TelephonyProvider on devices where we don't
use the apns-conf.xml file.

Bug: 37283190
Test: manual
Change-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
Merged-In: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
2017-06-09 10:41:37 -07:00
Clara Bayarri
f93c97f73e Merge "Replace fonts of unknown origin" into oc-dev
am: 3eae564fec

Change-Id: I9993d1afdbf3cd88cfd1861872baa7b0ee23e7ba
2017-06-09 17:37:59 +00:00
Clara Bayarri
e9261d2b84 Merge "Replace fonts of unknown origin" into oc-dev
am: 3eae564fec

Change-Id: Ied313294ca2de00f654e0c912717286f2725cc18
2017-06-09 17:37:58 +00:00
Jordan Liu
7b78a176a9 Merge "Add IApnSourceService.aidl"
am: 1d5d409f6f

Change-Id: Id76c6c83d18482594730f7e584231f7f4714b46d
2017-06-09 17:33:56 +00:00
Clara Bayarri
3eae564fec Merge "Replace fonts of unknown origin" into oc-dev 2017-06-09 17:31:22 +00:00
Jordan Liu
1d5d409f6f Merge "Add IApnSourceService.aidl" 2017-06-09 17:25:10 +00:00
Jason Monk
05ac6544c9 Merge "Add notification listener plugin hook" into oc-dr1-dev
am: 8f8b5ac031

Change-Id: Id40b6acf8e144c92ea4cb9a3604bc798d3c51e8b
2017-06-09 17:03:28 +00:00
Jason Monk
8f8b5ac031 Merge "Add notification listener plugin hook" into oc-dr1-dev 2017-06-09 16:57:49 +00:00
Android Build Merger (Role)
425a958770 Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 728c610446 -s ours am: b059f0bc3d -s ours" into oc-dr1-dev-plus-aosp 2017-06-09 16:17:25 +00:00
Bill Yi
0f234a579c Merge "Import translations. DO NOT MERGE" into oc-dev am: 728c610446 -s ours
am: b059f0bc3d  -s ours

Change-Id: I63dbf1618312c7a36b6d551bc4df29e24b8f9dff
2017-06-09 16:14:49 +00:00
Bill Yi
de19b85c6c Merge "Import translations. DO NOT MERGE" into oc-dev am: 728c610446 -s ours
am: 1de3fd81e0  -s ours

Change-Id: I4481d8b44aa5b37e131cffb813b4aebf9a77b681
2017-06-09 16:14:45 +00:00
Bill Yi
1de3fd81e0 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 728c610446  -s ours

Change-Id: Ide88aef2c9d0a04ed9376fcb45d3277f9e749afa
2017-06-09 16:10:02 +00:00
Bill Yi
b059f0bc3d Merge "Import translations. DO NOT MERGE" into oc-dev
am: 728c610446  -s ours

Change-Id: I6b15bd645c0d70a710a45e213a95066e93be50b1
2017-06-09 16:08:19 +00:00
TreeHugger Robot
728c610446 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-09 16:02:29 +00:00
Sungsoo Lim
07c9c4483c Merge "Fix the finding logic of MediaButtonSession" into oc-dev am: 9cfd30202d
am: 3997797998

Change-Id: I7663e1a9755eaa79eecd3d6c808047349aa72b36
2017-06-09 15:53:32 +00:00
Sungsoo Lim
1ff6d52bd2 Merge "Fix the finding logic of MediaButtonSession" into oc-dev am: 9cfd30202d
am: acd925d497

Change-Id: I2e1fe0367a3fe06110cf28c297422cfe07c374c8
2017-06-09 15:49:48 +00:00
Sungsoo Lim
3997797998 Merge "Fix the finding logic of MediaButtonSession" into oc-dev
am: 9cfd30202d

Change-Id: I4de9857958f30cfa251da56d20c07fcca8973d95
2017-06-09 15:44:33 +00:00
Sungsoo Lim
acd925d497 Merge "Fix the finding logic of MediaButtonSession" into oc-dev
am: 9cfd30202d

Change-Id: I5a12aef2922ccc468469c3b32f2fddda8e044fa0
2017-06-09 15:42:50 +00:00
Sungsoo Lim
9cfd30202d Merge "Fix the finding logic of MediaButtonSession" into oc-dev 2017-06-09 15:38:48 +00:00
Bill Yi
4ae0807ac0 Import translations. DO NOT MERGE
Change-Id: I868ab44fa40985282a8a7b46ea94d951d18e4fd3
Auto-generated-cl: translation import
2017-06-09 07:01:59 -07:00
Android Build Merger (Role)
dbeaae883c Merge "Merge "Fix deadlock when create alert window notification" into oc-dev am: 678477b383 am: d5418a231b" into oc-dr1-dev-plus-aosp 2017-06-09 13:25:05 +00:00
Wale Ogunwale
e1549fe76c Merge "Fix deadlock when create alert window notification" into oc-dev am: 678477b383
am: d5418a231b

Change-Id: I48aadf1444ce14bbff67894fdb0a6fdf1dbb2ecf
2017-06-09 13:23:13 +00:00
Wale Ogunwale
3692e73964 Merge "Fix deadlock when create alert window notification" into oc-dev am: 678477b383
am: 59cd5a98dc

Change-Id: I00b769b3bce0ca6851001a84f4c53c16f5094c6c
2017-06-09 13:23:09 +00:00
Wale Ogunwale
59cd5a98dc Merge "Fix deadlock when create alert window notification" into oc-dev
am: 678477b383

Change-Id: If4da36399c68f7a91c0ab87d398eb3cdb70f2215
2017-06-09 13:15:38 +00:00
Wale Ogunwale
d5418a231b Merge "Fix deadlock when create alert window notification" into oc-dev
am: 678477b383

Change-Id: I2c6149881b738777ed309209538c5d9726d36c36
2017-06-09 13:15:38 +00:00
Wale Ogunwale
678477b383 Merge "Fix deadlock when create alert window notification" into oc-dev 2017-06-09 13:07:18 +00:00
Hugo Benichi
24fa587ed7 Merge "Revert "Instrument captive portal login activity"" am: 2921320517 am: bbddbfc451
am: 56057f2b55  -s ours

Change-Id: I22d9980ace64235c8b88417bb4b818a13cbb65e0
2017-06-09 12:10:15 +00:00