OSDN Git Service
Suprabh Shukla [Tue, 23 May 2017 00:40:39 +0000 (00:40 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev am:
7a940ac844
am:
170915b4ac
Change-Id: I0c35b373c39a61288e7c6058a2471726a42c4b97
Suprabh Shukla [Tue, 23 May 2017 00:33:15 +0000 (00:33 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev
am:
7a940ac844
Change-Id: I2f67d726346362796f12f83540f8bbc1e3f12cc1
Sudheer Shanka [Tue, 23 May 2017 00:32:12 +0000 (00:32 +0000)]
Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev am:
9765bcf761
am:
679af1adeb
Change-Id: Ifea505897f0d6bdc269cf5e14f05cbf1fa7d7cd8
Sudheer Shanka [Tue, 23 May 2017 00:26:36 +0000 (00:26 +0000)]
Merge "Read cpu freq data only when needed." into oc-dev am:
fdeb6b8ed3
am:
7c1598d5e8
Change-Id: I82502ee6740a451b23fcef8c5383988615ff7651
Matthew Ng [Tue, 23 May 2017 00:24:28 +0000 (00:24 +0000)]
Merge "Fixes landscape minimized bounds for launcher hiding widget control" into oc-dev am:
7f48176022
am:
4319ddf8c7
Change-Id: I01035e5b996236ed8a4772fd27c65a7235f59fca
Sudheer Shanka [Tue, 23 May 2017 00:22:36 +0000 (00:22 +0000)]
Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev
am:
9765bcf761
Change-Id: I0843273dd409075eb924e88854309b7b502b09d0
Sudheer Shanka [Tue, 23 May 2017 00:20:34 +0000 (00:20 +0000)]
Merge "Read cpu freq data only when needed." into oc-dev
am:
fdeb6b8ed3
Change-Id: I241535a379b8e3cf547d73c05fe0dc7298ccc958
Matthew Ng [Tue, 23 May 2017 00:16:05 +0000 (00:16 +0000)]
Merge "Fixes landscape minimized bounds for launcher hiding widget control" into oc-dev
am:
7f48176022
Change-Id: I3aa5adcd7e16b36c7d614330a68d698210e63954
TreeHugger Robot [Tue, 23 May 2017 00:02:13 +0000 (00:02 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev
Sudheer Shanka [Tue, 23 May 2017 00:01:54 +0000 (00:01 +0000)]
Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev
Sudheer Shanka [Mon, 22 May 2017 23:51:56 +0000 (23:51 +0000)]
Merge "Read cpu freq data only when needed." into oc-dev
TreeHugger Robot [Mon, 22 May 2017 23:50:06 +0000 (23:50 +0000)]
Merge "Fixes landscape minimized bounds for launcher hiding widget control" into oc-dev
Winson Chung [Mon, 22 May 2017 23:44:39 +0000 (23:44 +0000)]
Merge "Properly defer entrance animations until after the stack is reloaded." into oc-dev am:
bc13f7174a
am:
9862cd02be
Change-Id: I69dbb891acbfefb7c9547cb5b58e4d19011fdb3a
Jerry Zhang [Mon, 22 May 2017 23:42:19 +0000 (23:42 +0000)]
Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev am:
3a958a09d2
am:
59c8132116 -s ours
Change-Id: Ie95427a7ee05c01d58a7440ff78cb0ae77646297
Winson Chung [Mon, 22 May 2017 23:30:08 +0000 (23:30 +0000)]
Merge "Properly defer entrance animations until after the stack is reloaded." into oc-dev
am:
bc13f7174a
Change-Id: Ifa487b7d65ad5a3c21654c6910fb785d47a1a0f1
Jerry Zhang [Mon, 22 May 2017 23:27:43 +0000 (23:27 +0000)]
Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev
am:
3a958a09d2
Change-Id: If10f8cf662369ecbb95bc6f04388271a535cd259
Jack Yu [Mon, 22 May 2017 23:21:00 +0000 (23:21 +0000)]
Merge "Added IWLAN metered APN support"
Winson Chung [Mon, 22 May 2017 23:20:09 +0000 (23:20 +0000)]
Merge "Properly defer entrance animations until after the stack is reloaded." into oc-dev
Eugene Susla [Mon, 22 May 2017 23:18:00 +0000 (23:18 +0000)]
Merge "Fix Companion UI crash on configuration change" into oc-dev am:
c1e3ab359f
am:
7f0e3b5996
Change-Id: I033327cd9ff7c24aa6f6eeba07cd96af15227ae4
Jerry Zhang [Mon, 22 May 2017 23:13:53 +0000 (23:13 +0000)]
Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev
Eugene Susla [Mon, 22 May 2017 23:09:13 +0000 (23:09 +0000)]
Merge "Fix Companion UI crash on configuration change" into oc-dev
am:
c1e3ab359f
Change-Id: Ia856f6b9c5db4f5b061930469650321bc1452497
Jiaquan He [Mon, 22 May 2017 22:58:09 +0000 (22:58 +0000)]
Merge "Do not relayout on default focus highlight." into oc-dev am:
badb83b332
am:
806ee59c00
Change-Id: I83152e4405573b21e92fc92190bee9bae82d101b
George Mount [Mon, 22 May 2017 22:54:43 +0000 (22:54 +0000)]
Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev am:
78af0424fe
am:
eb109450a5
Change-Id: I7c0b717df15648a217badd7a745680792bbb4539
Eugene Susla [Mon, 22 May 2017 22:54:34 +0000 (22:54 +0000)]
Merge "Fix Companion UI crash on configuration change" into oc-dev
Bryce Lee [Mon, 22 May 2017 22:43:42 +0000 (22:43 +0000)]
Merge "Remove all activities that do not successfully launch." into oc-dev am:
1a08d200fb
am:
1f459d2f32
Change-Id: I2d8eef0575d3b8282eb46aff7a0f4afe73bfebf5
Jiaquan He [Mon, 22 May 2017 22:36:42 +0000 (22:36 +0000)]
Merge "Do not relayout on default focus highlight." into oc-dev
am:
badb83b332
Change-Id: I7174ffcfef9d32b4b7559251060cea8ce8a34d58
Julia Reynolds [Mon, 22 May 2017 22:32:02 +0000 (22:32 +0000)]
Merge "Re-add default channel on app targetsdk downgrade." into oc-dev am:
4c11bde01d
am:
c17f1d9c9b
Change-Id: Ie26680bf227427c05167af7a32313f199ed7ae7d
Jiaquan He [Mon, 22 May 2017 22:25:09 +0000 (22:25 +0000)]
Merge "Do not relayout on default focus highlight." into oc-dev
George Mount [Mon, 22 May 2017 22:17:58 +0000 (22:17 +0000)]
Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev
am:
78af0424fe
Change-Id: Ie176c340d3be10f6173fdc23c899c797197a918e
Bryce Lee [Mon, 22 May 2017 22:15:23 +0000 (22:15 +0000)]
Merge "Remove all activities that do not successfully launch." into oc-dev
am:
1a08d200fb
Change-Id: I3c64a124b326b96ee38d55bef230d469e34e3db8
Julia Reynolds [Mon, 22 May 2017 22:12:45 +0000 (22:12 +0000)]
Merge "Re-add default channel on app targetsdk downgrade." into oc-dev
am:
4c11bde01d
Change-Id: Ied0dc35d017d7bf716a121979e6839c3b2ec494f
TreeHugger Robot [Mon, 22 May 2017 22:07:11 +0000 (22:07 +0000)]
Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev
TreeHugger Robot [Mon, 22 May 2017 22:05:54 +0000 (22:05 +0000)]
Merge "Remove all activities that do not successfully launch." into oc-dev
TreeHugger Robot [Mon, 22 May 2017 22:03:00 +0000 (22:03 +0000)]
Merge "Re-add default channel on app targetsdk downgrade." into oc-dev
TreeHugger Robot [Mon, 22 May 2017 21:54:22 +0000 (21:54 +0000)]
Merge "MediaPlayer: fix typo in stop() documentation"
Erik Wolsheimer [Mon, 22 May 2017 21:52:05 +0000 (21:52 +0000)]
Merge "Turn on generic multi-window and multi-display in order to support Activity in virtual display" into oc-dev am:
ce7e3e3a90
am:
5ef26b63c6
Change-Id: I737b16c2c7a990dc808bfa6af297288c40e1e934
TreeHugger Robot [Mon, 22 May 2017 21:46:29 +0000 (21:46 +0000)]
Merge "Ignore RoundedCornersTest until flake is fixed"
Erik Wolsheimer [Mon, 22 May 2017 21:33:55 +0000 (21:33 +0000)]
Merge "Turn on generic multi-window and multi-display in order to support Activity in virtual display" into oc-dev
am:
ce7e3e3a90
Change-Id: Id0a0eb6757e5ddc0af7ad6844f78bbb0a51a8f58
TreeHugger Robot [Mon, 22 May 2017 21:24:24 +0000 (21:24 +0000)]
Merge "Turn on generic multi-window and multi-display in order to support Activity in virtual display" into oc-dev
Matthew Ng [Mon, 22 May 2017 21:08:07 +0000 (21:08 +0000)]
Merge "Do not unminimize after rotate when minimized getting wrong transition" into oc-dev am:
97960fbf84
am:
f61883caa8
Change-Id: I5a39bc6661ea9ec378d904b6002471e4d4a0866d
Rubin Xu [Mon, 22 May 2017 21:00:13 +0000 (21:00 +0000)]
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid"
Matthew Ng [Mon, 22 May 2017 20:56:00 +0000 (20:56 +0000)]
Merge "Do not unminimize after rotate when minimized getting wrong transition" into oc-dev
am:
97960fbf84
Change-Id: I38b00abe92611b8a87b2355f7e104f84a384172e
Matthew Ng [Mon, 22 May 2017 20:47:06 +0000 (20:47 +0000)]
Merge "Do not unminimize after rotate when minimized getting wrong transition" into oc-dev
Dianne Hackborn [Mon, 22 May 2017 20:20:38 +0000 (20:20 +0000)]
Merge "Fix issue #
38393543: Not allowed to start service Intent" into oc-dev am:
ad6dde65ff
am:
7fdeb9ff3f
Change-Id: Ie6cfe023f733079d3fb685b841bc0e90506c0ab3
Jiaquan He [Thu, 11 May 2017 18:56:43 +0000 (11:56 -0700)]
Do not relayout on default focus highlight.
Test: AdjacentListsWithAdjacentISVsInsideTest.testFocusedRectAndFocusHintWorkWithinListItemHorizontal
Bug:
38195445
Change-Id: I4ba61d1dd6b806bff5305986a086c436c3b05b12
Todd Kennedy [Mon, 22 May 2017 20:07:55 +0000 (13:07 -0700)]
fix import order
Test: manual
Change-Id: Idb5793bd322b27fdd5d60f5c8a552a38d3eedfa5
Dianne Hackborn [Mon, 22 May 2017 20:09:29 +0000 (20:09 +0000)]
Merge "Fix issue #
38393543: Not allowed to start service Intent" into oc-dev
am:
ad6dde65ff
Change-Id: Ife26f513fa6d04771148a3965171822874854828
Matthew Ng [Wed, 17 May 2017 22:03:18 +0000 (15:03 -0700)]
Fixes landscape minimized bounds for launcher hiding widget control
Adds the statusbar height to the left bound of the launcher when in
minimized mode forgotten when added to the docked app in ag/
2126615.
That bug requested to add the statusbar height to the docked stack
making it larger.
Test: manual, go into minimized state, drag a widget from launcher
Change-Id: I11e6f5b9154bc7ade026f230849adc2c722a9626
Fixes:
38301371
Dianne Hackborn [Mon, 22 May 2017 20:03:29 +0000 (20:03 +0000)]
Merge "Fix issue #
38393543: Not allowed to start service Intent" into oc-dev
Julia Reynolds [Mon, 22 May 2017 19:47:06 +0000 (15:47 -0400)]
Re-add default channel on app targetsdk downgrade.
Test: runtest systemui-notification, and manual: adb install the
apk pulled off dogfood device, verify that sending an email
results in a toast pre change and no toast + notification
post change.
Change-Id: Ia3db55959906f38a5dc34cb38a33072c1f2dd64f
Fixes:
38437227
Geoffrey Pitsch [Mon, 22 May 2017 19:34:28 +0000 (19:34 +0000)]
Merge "Fix AppOps exception for notification channel toasts" into oc-dev am:
5c720a5f09
am:
5ce551ccc1
Change-Id: If724820013eed91bf8d0b4ac6d5d3f157e36fdec
Geoffrey Pitsch [Mon, 22 May 2017 19:32:29 +0000 (15:32 -0400)]
Ignore RoundedCornersTest until flake is fixed
Test: runtest systemui
Bug:
38500852
Change-Id: I5fb0459cadd19917093218a90bc3c9bde4815f58
TreeHugger Robot [Mon, 22 May 2017 19:30:27 +0000 (19:30 +0000)]
Merge "Add SmallTest for presubmit"
Geoffrey Pitsch [Mon, 22 May 2017 19:24:01 +0000 (19:24 +0000)]
Merge "Fix AppOps exception for notification channel toasts" into oc-dev
am:
5c720a5f09
Change-Id: Ic74620e9b9898d65ad98a5e884f5a233ec56a9b0
TreeHugger Robot [Mon, 22 May 2017 19:17:37 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 22 May 2017 19:10:06 +0000 (19:10 +0000)]
Merge "Fix AppOps exception for notification channel toasts" into oc-dev
Andrew Scull [Mon, 22 May 2017 18:49:35 +0000 (18:49 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings"
Jack Yu [Sun, 21 May 2017 00:06:33 +0000 (17:06 -0700)]
Added IWLAN metered APN support
If the device is in IWLAN mode, when checking if the APN
type is metered, we read the settings from the IWLAN
metered APN list.
Test: Telephony unit tests
bug:
38304530
Change-Id: I46c9e1a15dd0dd40811d5a959d558fc78608b127
Bryce Lee [Mon, 22 May 2017 18:28:28 +0000 (18:28 +0000)]
Merge "Wait on activity brought to front for trampoline activities." into oc-dev am:
1ba237d237
am:
5ff4d45163
Change-Id: I4de41303b1c2a59c9d7470ceab1b8902d2be5596
Bryce Lee [Mon, 22 May 2017 18:12:49 +0000 (18:12 +0000)]
Merge "Wait on activity brought to front for trampoline activities." into oc-dev
am:
1ba237d237
Change-Id: I61a006f5e8e2b29964f063ce1eb55154ce29a3b8
TreeHugger Robot [Mon, 22 May 2017 18:03:22 +0000 (18:03 +0000)]
Merge "TrustManagerService.java: fix SynchronizeOnNonFinalField warning"
TreeHugger Robot [Mon, 22 May 2017 18:02:16 +0000 (18:02 +0000)]
Merge "Wait on activity brought to front for trampoline activities." into oc-dev
Jerry Zhang [Thu, 4 May 2017 23:30:12 +0000 (16:30 -0700)]
Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."
This reverts commit
c889b4f4eb62ae7ad8de3ff3d98768e71cb3ad5a.
Merged-In: I74306bacad2a61471a9b8c9fd881229b22b6975e
Change-Id: I74306bacad2a61471a9b8c9fd881229b22b6975e
TreeHugger Robot [Mon, 22 May 2017 17:47:38 +0000 (17:47 +0000)]
Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs.""
Rebecca Silberstein [Mon, 22 May 2017 17:17:00 +0000 (17:17 +0000)]
Merge "WifiManager: get startLOHS packageName" into oc-dev am:
07f580eaff
am:
5dceb97fd3
Change-Id: I47cac61d2d4f4b8d4c659bfc4bb764710f67b018
Rebecca Silberstein [Mon, 22 May 2017 17:04:26 +0000 (17:04 +0000)]
Merge "WifiManager: get startLOHS packageName" into oc-dev
am:
07f580eaff
Change-Id: I06d47557fd35f519fbfe5d1ee11ec02c5027e4c7
Geoffrey Pitsch [Fri, 19 May 2017 22:41:32 +0000 (18:41 -0400)]
Add SmallTest for presubmit
Test: N/A
Change-Id: I93ca5c7f794b2e5bbc8632cf3688d3eff541c669
John Reck [Mon, 22 May 2017 17:00:52 +0000 (17:00 +0000)]
Merge "Convert Shader to NativeAllocationRegistry"
Rebecca Silberstein [Mon, 22 May 2017 16:57:52 +0000 (16:57 +0000)]
Merge "WifiManager: get startLOHS packageName" into oc-dev
George Mount [Tue, 16 May 2017 22:12:06 +0000 (15:12 -0700)]
Attempt to fix broken/flaky FadeTransitionTest
Bug
38349552
This is a blind fix for the test, but it should reduce flakiness
by removing the use of Thread.sleep().
Test: ran FadeTransitionTest
Change-Id: I3156c354b370c34885dfbfd7ecd1b5908a9dab44
Winson Chung [Mon, 22 May 2017 16:32:01 +0000 (16:32 +0000)]
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev am:
305c332c22
am:
75eab7fa16
Change-Id: I48f1fd5730232c6978fedfeb42bb07684d667da4
Winson Chung [Mon, 22 May 2017 16:20:18 +0000 (16:20 +0000)]
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev
am:
305c332c22
Change-Id: I9fc712b5b5d96398177883b1979a3ea5744efa89
Jonathan Solnit [Mon, 22 May 2017 16:19:36 +0000 (16:19 +0000)]
Merge "Change camera lift sensor to trigger sensor"
Winson Chung [Mon, 22 May 2017 16:11:24 +0000 (16:11 +0000)]
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev
Bryce Lee [Mon, 22 May 2017 14:58:30 +0000 (14:58 +0000)]
Merge "Disallow starting activities without new task from non-activity context." into oc-dev am:
3ebe54b3e6
am:
b8bcdf50e4
Change-Id: Ib3a056213274cd3d7b86859be43893777f4230cb
Geoffrey Pitsch [Mon, 22 May 2017 14:53:44 +0000 (10:53 -0400)]
Fix AppOps exception for notification channel toasts
Check isSystemToast before noteNotifcationOp
Test: manual
Change-Id: Ie65b57365389b083a14c030642d79e98f686c303
Fixes:
38474090
Bryce Lee [Mon, 22 May 2017 14:43:32 +0000 (14:43 +0000)]
Merge "Disallow starting activities without new task from non-activity context." into oc-dev
am:
3ebe54b3e6
Change-Id: I4a89ce60dad32f41f4e77b81a6af56c89845987a
Bryce Lee [Mon, 22 May 2017 14:30:59 +0000 (14:30 +0000)]
Merge "Disallow starting activities without new task from non-activity context." into oc-dev
Phil Weaver [Mon, 22 May 2017 13:27:17 +0000 (13:27 +0000)]
Merge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev am:
ed83139842
am:
204f535e2c
Change-Id: I16896585c4b4b1f064efb29631ca8c6684d3b76e
Etan Cohen [Mon, 22 May 2017 13:24:52 +0000 (13:24 +0000)]
Merge "[AWARE] Enhance debug logs"
Andrew Scull [Mon, 22 May 2017 13:20:09 +0000 (14:20 +0100)]
TrustManagerService.java: fix SynchronizeOnNonFinalField warning
Synchronizing on non-final fields is not safe: if the field is ever
updated, different threads may end up locking on different objects.
Test: Build
Change-Id: I3ad24e79c762bd8378c6765e68ae48e9eb86147d
Phil Weaver [Mon, 22 May 2017 13:13:34 +0000 (13:13 +0000)]
Merge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev
am:
ed83139842
Change-Id: I7721cfee4ef04aa463a687b8223f881e9d153394
Phil Weaver [Mon, 22 May 2017 13:03:39 +0000 (13:03 +0000)]
Merge "Revert "NumberPicker a11y (and a11y-inspired) fixes"" into oc-dev
Andrew Scull [Fri, 19 May 2017 14:37:20 +0000 (15:37 +0100)]
NetworkManagementService.java: fix error-prone warnings
- Lock objects should be final
- Inner classes should be static if possible
Change-Id: Idca268e03ea1e9f80e64012d1e011dc8bca1d9a8
Bug:
38446237
Test: Build
zhouzhijie [Mon, 22 May 2017 11:24:31 +0000 (11:24 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed" am:
99cf40a25a am:
3818d4187c am:
b7681ecd46
am:
73e7a17a21
Change-Id: I0bceaab31760e89eb0968561b4358adbc4aec724
zhouzhijie [Mon, 22 May 2017 11:13:35 +0000 (11:13 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed" am:
99cf40a25a am:
3818d4187c
am:
b7681ecd46
Change-Id: I95284107f41b8bc4f4eae0870796f85a8b0b178b
zhouzhijie [Mon, 22 May 2017 11:02:28 +0000 (11:02 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed" am:
99cf40a25a
am:
3818d4187c
Change-Id: Iafc7ccd9bdd120100ae4063d72379479693142f9
Yipeng Cao [Mon, 22 May 2017 10:57:26 +0000 (10:57 +0000)]
Merge "Revert the system clock in the debug oc-dev" into oc-dev am:
4229cb80a0
am:
98af818d03
Change-Id: Id7aacffd3fa48d76003840fff8f4d48197eae936
zhouzhijie [Mon, 22 May 2017 10:52:28 +0000 (10:52 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed"
am:
99cf40a25a
Change-Id: I9d45fc368e746efa40df96c39719566a201dad45
Yipeng Cao [Mon, 22 May 2017 10:47:28 +0000 (10:47 +0000)]
Merge "Revert the system clock in the debug oc-dev" into oc-dev
am:
4229cb80a0
Change-Id: Icef2e7fb527f90a44839b3f1a2f931760b6696b2
Treehugger Robot [Mon, 22 May 2017 10:41:38 +0000 (10:41 +0000)]
Merge "Creat a new notification to avoid the mTetheredNotificationBuilder changed"
TreeHugger Robot [Mon, 22 May 2017 10:36:34 +0000 (10:36 +0000)]
Merge "Revert the system clock in the debug oc-dev" into oc-dev
Andre Eisenbach [Sat, 20 May 2017 00:56:16 +0000 (00:56 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am:
a2663b0060 am:
b04d7ceaeb am:
a8ffb9fd3d
am:
0471a2975a
Change-Id: I98a1b0f3250e5f0bbfdb6310c2460894224cb64b
Andre Eisenbach [Sat, 20 May 2017 00:50:20 +0000 (00:50 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am:
a2663b0060 am:
b04d7ceaeb
am:
a8ffb9fd3d
Change-Id: I4313e847de1e6cfd550bc9b1ca6a8c121b6c0403
Andre Eisenbach [Sat, 20 May 2017 00:43:16 +0000 (00:43 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am:
a2663b0060
am:
b04d7ceaeb
Change-Id: I66bdfd02f8d5322173ba85a2c427158a237cb215
Andre Eisenbach [Sat, 20 May 2017 00:36:15 +0000 (00:36 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2"
am:
a2663b0060
Change-Id: I015534f9fb860fd0f875bab3d9130de029dc16b9
Andre Eisenbach [Sat, 20 May 2017 00:28:59 +0000 (00:28 +0000)]
Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2"
Hemant Gupta [Sat, 17 Oct 2015 14:10:53 +0000 (19:40 +0530)]
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.
Bug:
33011817
Change-Id: I8a772b0dddf6ecf74b057e12d7596421c0e0f558
TreeHugger Robot [Sat, 20 May 2017 00:25:00 +0000 (00:25 +0000)]
Merge "Gradient drawable bounds"
Sudheer Shanka [Fri, 19 May 2017 18:33:42 +0000 (11:33 -0700)]
Read cpu freq data only when needed.
Bug:
34133340
Test: cts-tradefed run singleCommand cts-dev -m ctsIncidentHostTestCases -t \
com.android.server.cts.BatteryStatsValidationTest
Change-Id: Ib235e166820b95b5cd0a496b6146ea353abdf844
OSDN Git Service
