OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 am: 26431282ec...
Winson Chung [Tue, 24 May 2016 20:37:04 +0000 (20:37 +0000)]
Merge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 am: 26431282ec" into nyc-mr1-dev-plus-aosp
am: 9c8953b910

* commit '9c8953b910f25d058cdaf37053c07ae0a40e1b14':
  Process user events from service lifecycle callbacks.

Change-Id: I4858fd5659c4b3fb231d50bbb1e93b012c4282c1

8 years agoMerge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f...
Selim Cinek [Tue, 24 May 2016 20:37:00 +0000 (20:37 +0000)]
Merge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9 am: f03a50c4cb" into nyc-mr1-dev-plus-aosp
am: f3ad723c42

* commit 'f3ad723c42a5d90b699dfbe88eab8ccc3c3bc317':

Change-Id: I37152c6de945de26ffc1829218aff1d617ea0007

8 years agoMerge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f...
Chih-Hung Hsieh [Tue, 24 May 2016 20:36:53 +0000 (20:36 +0000)]
Merge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp am: e60c649ada" into nyc-mr1-dev-plus-aosp
am: ce685d90a5

* commit 'ce685d90a53dd47c9c8d02a8ec5fd4fe59afd77e':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: I08ca821a4d6b9295efc1522c558f3449126ef5f3

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738...
Selim Cinek [Tue, 24 May 2016 20:26:29 +0000 (20:26 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738 am: 40a6b1dbb5
am: a6954bc53c

* commit 'a6954bc53c7682c89f8f354bb019882e87b62bc0':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Ica13b23532b0d207d05068d8ecbd8c01f66006ee

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am...
Tony Mak [Tue, 24 May 2016 20:26:21 +0000 (20:26 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: 18b1826a8c
am: 74275b16d1

* commit '74275b16d1affa756246664dfc951878c616cfb5':

Change-Id: I1cae997343d5e492c6a1aab565c708d2f4192e18

8 years agoMerge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181...
Adarsh Fernando [Tue, 24 May 2016 20:26:13 +0000 (20:26 +0000)]
Merge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: fa6e151d5d" into nyc-mr1-dev-plus-aosp
am: 0fbfc4b689

* commit '0fbfc4b6895679fa20f810c88302aee10b6da656':

Change-Id: I4ae79004d47bd3e282f358dba14e9b2d0c5279dd

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am...
Tony Mak [Tue, 24 May 2016 20:26:03 +0000 (20:26 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: 5e08d12331
am: 3fbe5c0d34

* commit '3fbe5c0d34769ca0237a8bf7ea4c38ed1e4f8edd':
  Fix first notification of each app is not shown

Change-Id: I645d0ae0b2f55b72510921b9a2abeb71499a5a68

8 years agoMerge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 am: 26431282ec...
Android Build Merger (Role) [Tue, 24 May 2016 20:21:55 +0000 (20:21 +0000)]
Merge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 am: 26431282ec" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f...
Android Build Merger (Role) [Tue, 24 May 2016 20:21:45 +0000 (20:21 +0000)]
Merge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9 am: f03a50c4cb" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f...
Android Build Merger (Role) [Tue, 24 May 2016 20:21:36 +0000 (20:21 +0000)]
Merge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp am: e60c649ada" into nyc-mr1-dev-plus-aosp

8 years agoMerge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3
Winson Chung [Tue, 24 May 2016 20:21:05 +0000 (20:21 +0000)]
Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3
am: 26431282ec

* commit '26431282ec5a25b94114c8acff38ba6178bb2c31':
  Process user events from service lifecycle callbacks.

Change-Id: I51a1c243eb0dc8beebab0a19cd5c3636295c9ea8

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9
Selim Cinek [Tue, 24 May 2016 20:21:02 +0000 (20:21 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9
am: f03a50c4cb

* commit 'f03a50c4cb8b5e50a751dd7a8ac7bd80b27364e2':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Id73011f950e037af8a7eee7e6490777b150d6adc

8 years agoMerge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4...
Chih-Hung Hsieh [Tue, 24 May 2016 20:20:59 +0000 (20:20 +0000)]
Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp
am: e60c649ada

* commit 'e60c649adab7bbbbce1118d3598446973adf2f0b':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: Iaed05df438fd181694c71b842ecaed5b054352b6

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738
Tony Mak [Tue, 24 May 2016 20:20:58 +0000 (20:20 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738
am: 40a6b1dbb5

* commit '40a6b1dbb53fd4a8d499ee9ad0ba953137cfecec':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: I820cdd49b8bd04dd05fd18f2bf8456182ba6a725

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
Adarsh Fernando [Tue, 24 May 2016 20:20:53 +0000 (20:20 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
am: 18b1826a8c

* commit '18b1826a8c6e6a1026239478072bf7c725219dcf':

Change-Id: Idcd9c2cb66e11f88faab34363fc3a7e1cc5cbf7d

8 years agoMerge "Initialize device locked state during boot"
Xiaohui Chen [Tue, 24 May 2016 20:20:46 +0000 (20:20 +0000)]
Merge "Initialize device locked state during boot"

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am...
Adarsh Fernando [Tue, 24 May 2016 20:20:17 +0000 (20:20 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: 8a7d7a26e2
am: 4cdc70b070

* commit '4cdc70b07062812498a28d07c9267e7f6f18cd25':
  Doc: delete old test_framework.png

Change-Id: I8577ceb2bde65f304accf05241002af286634a40

8 years agoMerge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181...
Android Build Merger (Role) [Tue, 24 May 2016 20:17:35 +0000 (20:17 +0000)]
Merge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: fa6e151d5d" into nyc-mr1-dev-plus-aosp

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
Adarsh Fernando [Tue, 24 May 2016 20:17:04 +0000 (20:17 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
am: fa6e151d5d

* commit 'fa6e151d5de39d1be03f57854ed7596d28856d75':

Change-Id: Idb465177f33205908f510421a3166de7fc35a580

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
Adarsh Fernando [Tue, 24 May 2016 20:16:34 +0000 (20:16 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
am: 5e08d12331

* commit '5e08d12331c53c6db708877b012187c245097bfc':
  Fix first notification of each app is not shown

Change-Id: I428894e3442eb90fed192cfd58b44353ab2b03fe

8 years agoMerge changes I7773ed3a,I73d97d9a into nyc-dev
Selim Cinek [Tue, 24 May 2016 20:16:16 +0000 (20:16 +0000)]
Merge changes I7773ed3a,I73d97d9a into nyc-dev
am: a4400059a3

* commit 'a4400059a307adfea00a2ae3726949c802d4e2ad':
  Process user events from service lifecycle callbacks.

Change-Id: Ia7436eba1886c9bd739cc3cda5029fd8caf0b109

8 years agoMerge changes I7773ed3a,I73d97d9a into nyc-dev
Selim Cinek [Tue, 24 May 2016 20:16:16 +0000 (20:16 +0000)]
Merge changes I7773ed3a,I73d97d9a into nyc-dev
am: c178f519b9

* commit 'c178f519b94b239aa02633dae7127e619f5b0aa6':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Id9b18a7cdd1ed97a06916e6a29b7294551c33acf

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev
Tony Mak [Tue, 24 May 2016 20:16:08 +0000 (20:16 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev
am: ed353f1738

* commit 'ed353f173852551f0dc0b360512a9abc5c77c28e':
  Fix first notification of each app is not shown

Change-Id: Ib3702c334b7d41b75684720d36caaa62cc52f074

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev
Tony Mak [Tue, 24 May 2016 20:16:05 +0000 (20:16 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev
am: c178f519b9

* commit 'c178f519b94b239aa02633dae7127e619f5b0aa6':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: I42fa93677ccd0d58d7b71f274f77af867f065ac4

8 years agoMerge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4...
Android Build Merger (Role) [Tue, 24 May 2016 20:04:04 +0000 (20:04 +0000)]
Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp

8 years agoMerge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4
Chih-Hung Hsieh [Tue, 24 May 2016 20:03:38 +0000 (20:03 +0000)]
Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4
am: ba11b8e441

* commit 'ba11b8e441ab8637b377183d2f5941fcc0a37717':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: I848549377eb4ad8834a09ef4f12de52d1fb683c3

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev
Tony Mak [Tue, 24 May 2016 20:03:24 +0000 (20:03 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev
am: ed353f1738

* commit 'ed353f173852551f0dc0b360512a9abc5c77c28e':
  Fix first notification of each app is not shown

Change-Id: Ib099efe0bbaa0b89e18116ea718a7ac462128ed1

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
Adarsh Fernando [Tue, 24 May 2016 20:03:17 +0000 (20:03 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
am: 8a7d7a26e2

* commit '8a7d7a26e2d9ea0e99329e12b24a777eb3a3bd39':
  Doc: delete old test_framework.png

Change-Id: I2bf90b19f8d09804a3b4f3c00a3b55c379351225

8 years agoMerge "Process user events from service lifecycle callbacks." into nyc-dev
Winson Chung [Tue, 24 May 2016 20:02:52 +0000 (20:02 +0000)]
Merge "Process user events from service lifecycle callbacks." into nyc-dev

8 years agoMerge changes I7773ed3a,I73d97d9a into nyc-dev
Selim Cinek [Tue, 24 May 2016 20:01:22 +0000 (20:01 +0000)]
Merge changes I7773ed3a,I73d97d9a into nyc-dev

* changes:
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

8 years agoMerge "Rely on Tethering mutex for TetherInterfaceSM"
TreeHugger Robot [Tue, 24 May 2016 20:00:56 +0000 (20:00 +0000)]
Merge "Rely on Tethering mutex for TetherInterfaceSM"

8 years agoProcess user events from service lifecycle callbacks.
Winson [Sat, 21 May 2016 01:21:11 +0000 (18:21 -0700)]
Process user events from service lifecycle callbacks.

- Instead of waiting for the broadcast to start loading the user’s
  widgets, handle them in the service callbacks to ensure the app widget
  update broadcasts are enqueued earlier.

Bug: 27262341
Change-Id: I095abe5e15fe46412d00438986f7a9aee50872ca

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac
Adarsh Fernando [Tue, 24 May 2016 19:51:21 +0000 (19:51 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac
am: 130317181e

* commit '130317181ee2aeea0a5174bb332af2e313f93f1d':
  Doc: delete old test_framework.png

Change-Id: I4416be67896ea11cf464e94185089567d5e778e7

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac
Adarsh Fernando [Tue, 24 May 2016 19:50:48 +0000 (19:50 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac
am: 130317181e

* commit '130317181ee2aeea0a5174bb332af2e313f93f1d':
  Doc: delete old test_framework.png

Change-Id: Ic27253fcbffc8742a6a7e40895d425f366f673f8

8 years agoMerge "Fix misc-macro-parentheses warnings in common_time."
Chih-Hung Hsieh [Tue, 24 May 2016 19:50:27 +0000 (19:50 +0000)]
Merge "Fix misc-macro-parentheses warnings in common_time."
am: c49d21f9c4

* commit 'c49d21f9c4ac128bf150ba7c78c0c416640b8f77':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: Id0a364de6bbd776dc01cc5298a4a38f62b491020

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev
Tony Mak [Tue, 24 May 2016 19:46:11 +0000 (19:46 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev

8 years agoMerge "Merge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev am...
Wyatt Riley [Tue, 24 May 2016 19:40:35 +0000 (19:40 +0000)]
Merge "Merge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev am: 0f6363e8b3 am: 585fdc34f2" into nyc-mr1-dev-plus-aosp
am: 8abb576ef6

* commit '8abb576ef6e23fb8b0fa795549d91de9c8edec5a':

Change-Id: I719ac9651b48e280bbf467b70e4df7995717b3b7

8 years agoMerge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev am: 0f6363e8b3...
Wyatt Riley [Tue, 24 May 2016 19:40:29 +0000 (19:40 +0000)]
Merge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev am: 0f6363e8b3 am: 0174dbfc24
am: c8891fabc6

* commit 'c8891fabc601b3d11aa37d298f4262cb3f5b5310':
  Adding SBAS offset to Gps/Gnss SvStatus converter

Change-Id: Ibd171ef8e12dc00b17b8f46c60217b345b09e577

8 years agoMerge "Fix misc-macro-parentheses warnings in common_time."
Treehugger Robot [Tue, 24 May 2016 19:39:17 +0000 (19:39 +0000)]
Merge "Fix misc-macro-parentheses warnings in common_time."

8 years agoDoc: delete old test_framework.png am: 05c98d5458
Adarsh Fernando [Tue, 24 May 2016 19:33:17 +0000 (19:33 +0000)]
Doc: delete old test_framework.png am: 05c98d5458
am: 734e7725ac

* commit '734e7725ac142264025cb292a6d22b1e618c8e81':
  Doc: delete old test_framework.png

Change-Id: I5d3e86ad0acc0837d4476b5ff2897764ec7487de

8 years agoMerge "Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5...
Chih-Hung Hsieh [Tue, 24 May 2016 19:30:09 +0000 (19:30 +0000)]
Merge "Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5 am: ca3f49d594" into nyc-dev-plus-aosp am: a90bd3a04a
am: ce670fa370

* commit 'ce670fa370b3937ad2d878206bdf52b20cc8b470':
  Fix misc-macro-parentheses warnings in audio media jni.

Change-Id: I569467bf3014a7f83f54758623b566313839cf8d

8 years agoMerge "media: unhide codec levels" into nyc-dev am: aba6e2c78f am: 4493049a88
Lajos Molnar [Tue, 24 May 2016 19:29:48 +0000 (19:29 +0000)]
Merge "media: unhide codec levels" into nyc-dev am: aba6e2c78f am: 4493049a88
am: bb936c110c

* commit 'bb936c110c187c7303045ebdc2d8ea6ec30214cb':

Change-Id: Id452cd8fa2cd2f252c07db28900f0cb4bd253b87

8 years agoMerge "Merge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev am...
Android Build Merger (Role) [Tue, 24 May 2016 19:27:20 +0000 (19:27 +0000)]
Merge "Merge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev am: 0f6363e8b3 am: 585fdc34f2" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev am: 0f6363e8b3
Wyatt Riley [Tue, 24 May 2016 19:26:56 +0000 (19:26 +0000)]
Merge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev am: 0f6363e8b3
am: 585fdc34f2

* commit '585fdc34f2ecab5b4eb7e37ce7fb79cde1011446':
  Adding SBAS offset to Gps/Gnss SvStatus converter

Change-Id: I5f40c84facecf4aa08d0da6aece77a2b3d9b03c3

8 years agoMerge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev am: 0f6363e8b3
Wyatt Riley [Tue, 24 May 2016 19:26:17 +0000 (19:26 +0000)]
Merge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev am: 0f6363e8b3
am: 0174dbfc24

* commit '0174dbfc24bce5b440b7f6c95f6605ca16d8634c':
  Adding SBAS offset to Gps/Gnss SvStatus converter

Change-Id: I57e52857546fdfc75b65b6c452301c4940dbcb22

8 years agoMerge "media: unhide codec levels" into nyc-dev am: aba6e2c78f am: 674262b7e1
Lajos Molnar [Tue, 24 May 2016 19:21:49 +0000 (19:21 +0000)]
Merge "media: unhide codec levels" into nyc-dev am: aba6e2c78f am: 674262b7e1
am: cb86750595

* commit 'cb86750595879dcf633f2bcd630831116904c5db':
  media: unhide codec levels

Change-Id: Ie55028a97f05d5d8957dcf39828a45c3747a71a9

8 years agoMerge "Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5...
Chih-Hung Hsieh [Tue, 24 May 2016 19:21:05 +0000 (19:21 +0000)]
Merge "Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5 am: ca3f49d594" into nyc-dev-plus-aosp
am: a90bd3a04a

* commit 'a90bd3a04ae7d65f08bc8d839a3b9d2b96a99c2f':
  Fix misc-macro-parentheses warnings in audio media jni.

Change-Id: Iaaf546288ad59eab64d07d01dcf5fe30bb305046

8 years agoMerge "media: unhide codec levels" into nyc-dev am: aba6e2c78f
Lajos Molnar [Tue, 24 May 2016 19:20:59 +0000 (19:20 +0000)]
Merge "media: unhide codec levels" into nyc-dev am: aba6e2c78f
am: 4493049a88

* commit '4493049a88adf6a32284ebcb7e2720f1b5814210':

Change-Id: I80df72a7dbc95cdb0759c2a5b227924ebb21663e

8 years agoDoc: delete old test_framework.png
Adarsh Fernando [Tue, 24 May 2016 19:20:55 +0000 (19:20 +0000)]
Doc: delete old test_framework.png
am: 05c98d5458

* commit '05c98d54583b84160ab8d7957989c8448fc06301':
  Doc: delete old test_framework.png

Change-Id: I54e69e3123b993e9e6e6b9a8a0c1a2e89011ed76

8 years agoMerge "Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637...
Adarsh Fernando [Tue, 24 May 2016 19:12:46 +0000 (19:12 +0000)]
Merge "Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b81008076 am: 7932d67607 am: b7349b2990" into nyc-mr1-dev-plus-aosp
am: e6eb8f1093

* commit 'e6eb8f1093f1b2b638e6ef2c17d6ab1bf1041115':

Change-Id: Ib87997b106fd6d99e4688d050e6458433bdfbad0

8 years agoMerge "media: unhide codec levels" into nyc-dev am: aba6e2c78f
Lajos Molnar [Tue, 24 May 2016 19:12:45 +0000 (19:12 +0000)]
Merge "media: unhide codec levels" into nyc-dev am: aba6e2c78f
am: 674262b7e1

* commit '674262b7e14e0837464731f0150450a4d57ec58c':
  media: unhide codec levels

Change-Id: I226686f6b7215422878e35254eba26c81485f4e1

8 years agoMerge "Initial update of Micro theme for Material design." into nyc-mr1-dev am: 1d66a...
Michael Kwan [Tue, 24 May 2016 19:12:40 +0000 (19:12 +0000)]
Merge "Initial update of Micro theme for Material design." into nyc-mr1-dev am: 1d66ae128d
am: 4cf99bed0f

* commit '4cf99bed0f987e09e0f1a73d92b1c62dd40d144d':
  Initial update of Micro theme for Material design.

Change-Id: I9dd4a4e7bf03389b6fde91ce7f4c41e85aab4b5e

8 years agoDocs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b810...
Adarsh Fernando [Tue, 24 May 2016 19:12:31 +0000 (19:12 +0000)]
Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b81008076 am: 7932d67607 am: 8dc27182df
am: 2e8f0c8369

* commit '2e8f0c836916d1c18fb8bcca547db16c930be383':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: If2c1670433e13fe000140e93b27ab20bb6d89dbf

8 years agoMerge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev
Wyatt Riley [Tue, 24 May 2016 19:12:28 +0000 (19:12 +0000)]
Merge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev
am: 0f6363e8b3

* commit '0f6363e8b3b091508181ea6cef5f5f87a4f75016':
  Adding SBAS offset to Gps/Gnss SvStatus converter

Change-Id: If32179b0ea76b730b4944d0e487abf9427a69bc5

8 years agoMerge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev
Wyatt Riley [Tue, 24 May 2016 19:12:20 +0000 (19:12 +0000)]
Merge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev
am: 0f6363e8b3

* commit '0f6363e8b3b091508181ea6cef5f5f87a4f75016':
  Adding SBAS offset to Gps/Gnss SvStatus converter

Change-Id: Ia562243b80467aebab070ab327e83007936bfc63

8 years agoMerge "Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5...
Android Build Merger (Role) [Tue, 24 May 2016 18:57:11 +0000 (18:57 +0000)]
Merge "Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5 am: ca3f49d594" into nyc-dev-plus-aosp

8 years agoMerge "Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637...
Android Build Merger (Role) [Tue, 24 May 2016 18:56:56 +0000 (18:56 +0000)]
Merge "Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b81008076 am: 7932d67607 am: b7349b2990" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5
Chih-Hung Hsieh [Tue, 24 May 2016 18:56:37 +0000 (18:56 +0000)]
Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5
am: ca3f49d594

* commit 'ca3f49d594f5c00e6b5d6817bcdb0af02e7224e6':
  Fix misc-macro-parentheses warnings in audio media jni.

Change-Id: I3828c9720f7fe91bc60058daeca2d598f0302d32

8 years agoMerge "media: unhide codec levels" into nyc-dev
Lajos Molnar [Tue, 24 May 2016 18:56:32 +0000 (18:56 +0000)]
Merge "media: unhide codec levels" into nyc-dev
am: aba6e2c78f

* commit 'aba6e2c78f3188d201365a99f52be3074fc94962':
  media: unhide codec levels

Change-Id: I5a0253e8f8fe65551dadf8b3b024224fedd1042d

8 years agoMerge "media: unhide codec levels" into nyc-dev
Lajos Molnar [Tue, 24 May 2016 18:56:30 +0000 (18:56 +0000)]
Merge "media: unhide codec levels" into nyc-dev
am: aba6e2c78f

* commit 'aba6e2c78f3188d201365a99f52be3074fc94962':
  media: unhide codec levels

Change-Id: Ia2c706fe3dda13f759f54d769bac6c9fe6f34587

8 years agoDocs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b810...
Adarsh Fernando [Tue, 24 May 2016 18:56:24 +0000 (18:56 +0000)]
Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b81008076 am: 7932d67607
am: b7349b2990

* commit 'b7349b29901f487a70c4accbed30a7702e653a1f':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: Ib592b360949069af0125e12161115a16fef550c5

8 years agoMerge "Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 23ef1...
Amith Yamasani [Tue, 24 May 2016 18:54:57 +0000 (18:54 +0000)]
Merge "Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 23ef1f7653" into nyc-mr1-dev-plus-aosp
am: 111bab51dd

* commit '111bab51dd5ad2e9fda70006b3a2d8914d3cff2e':

Change-Id: If50ef3da160d34305e7aee51439a6738dbaa9581

8 years agoMerge "Initial update of Micro theme for Material design." into nyc-mr1-dev
Michael Kwan [Tue, 24 May 2016 18:54:56 +0000 (18:54 +0000)]
Merge "Initial update of Micro theme for Material design." into nyc-mr1-dev
am: 1d66ae128d

* commit '1d66ae128d3b81623891e07fc9f5dfd15ee055c4':
  Initial update of Micro theme for Material design.

Change-Id: Iffb58e0f0d45796d2951c3566f72db058d665b5a

8 years agoDocs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b810...
Adarsh Fernando [Tue, 24 May 2016 18:54:50 +0000 (18:54 +0000)]
Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b81008076 am: 7932d67607
am: 8dc27182df

* commit '8dc27182df596cf7ad77c507965880f7f85e2a69':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: I34a946fbc104f37bcd1a28abe13596f4180ab3a6

8 years agoMerge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 32257dbb4d
Amith Yamasani [Tue, 24 May 2016 18:54:49 +0000 (18:54 +0000)]
Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 32257dbb4d
am: 663cf283de

* commit '663cf283de26e9a98df78c14c4b89dfd7c1e60c3':
  Use correct synchronization lock

Change-Id: I4e81d710d3b90faea7d97fc693cd677c6bf230f4

8 years agoMerge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev
Wyatt Riley [Tue, 24 May 2016 18:52:50 +0000 (18:52 +0000)]
Merge "Adding SBAS offset to Gps/Gnss SvStatus converter" into nyc-dev

8 years agoMerge "Initial update of Micro theme for Material design." into nyc-mr1-dev
Michael Kwan [Tue, 24 May 2016 18:47:05 +0000 (18:47 +0000)]
Merge "Initial update of Micro theme for Material design." into nyc-mr1-dev

8 years agoMerge "Fix misc-macro-parentheses warnings in audio media jni."
Chih-Hung Hsieh [Tue, 24 May 2016 18:46:10 +0000 (18:46 +0000)]
Merge "Fix misc-macro-parentheses warnings in audio media jni."
am: 9ecb10d1b5

* commit '9ecb10d1b5a6cb0eb77beb432f2a4d657835414f':
  Fix misc-macro-parentheses warnings in audio media jni.

Change-Id: I201e57e87ae5eb52412f846e7652b695b1e15edb

8 years agoMerge "Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 23ef1...
Android Build Merger (Role) [Tue, 24 May 2016 18:45:06 +0000 (18:45 +0000)]
Merge "Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 23ef1f7653" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a17...
Felipe Leme [Tue, 24 May 2016 18:44:56 +0000 (18:44 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f am: 964914602b
am: 88873f92ab

* commit '88873f92ab5c618091df213bde131faf17d07ed5':

Change-Id: I68641babb3ffb81000cef3ce5adf0e655810a198

8 years agoDocs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b810...
Adarsh Fernando [Tue, 24 May 2016 18:44:48 +0000 (18:44 +0000)]
Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b81008076
am: 7932d67607

* commit '7932d676071e36b88a4105515cfb81c255398dd8':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: I17beb0583813d51213fb977f3ffd68bb919bda26

8 years agoMerge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a17...
Felipe Leme [Tue, 24 May 2016 18:44:45 +0000 (18:44 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f am: 223d4fff18
am: 3886a8cb0f

* commit '3886a8cb0f5e834352cfc28cd533ad1fd9115a33':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: If9e525f86b29960ed4dfdd6ca27bc5d0077454ae

8 years agoDocs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b810...
Adarsh Fernando [Tue, 24 May 2016 18:44:41 +0000 (18:44 +0000)]
Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637 am: 9b81008076
am: 7932d67607

* commit '7932d676071e36b88a4105515cfb81c255398dd8':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: Ifbfdcb353bf4b7100af20c0f0d784274945df2aa

8 years agoMerge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9
Amith Yamasani [Tue, 24 May 2016 18:44:38 +0000 (18:44 +0000)]
Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9
am: 23ef1f7653

* commit '23ef1f7653a792492fd5c64a786480b0a7b4e934':
  Use correct synchronization lock

Change-Id: Ife205c9b527546edab562bd936fb2649cb26e3c2

8 years agoMerge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9
Amith Yamasani [Tue, 24 May 2016 18:38:58 +0000 (18:38 +0000)]
Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9
am: 32257dbb4d

* commit '32257dbb4dffb680445d6a18a7418fb95cf63171':
  Use correct synchronization lock

Change-Id: Ia95571c01a08d2eed39f1c4a6b0266578578956a

8 years agoMerge "media: unhide codec levels" into nyc-dev
TreeHugger Robot [Tue, 24 May 2016 18:36:56 +0000 (18:36 +0000)]
Merge "media: unhide codec levels" into nyc-dev

8 years agoMerge "Fix misc-macro-parentheses warnings in audio media jni."
Treehugger Robot [Tue, 24 May 2016 18:33:48 +0000 (18:33 +0000)]
Merge "Fix misc-macro-parentheses warnings in audio media jni."

8 years agoMerge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
Felipe Leme [Tue, 24 May 2016 18:29:50 +0000 (18:29 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
am: 964914602b

* commit '964914602b4a62a72e448b0ad7109fea9115ac0e':

Change-Id: I34481e18cf75a8715d7169ce72c8affd5b86c79b

8 years agoMerge "Use correct synchronization lock" into nyc-dev
Amith Yamasani [Tue, 24 May 2016 18:29:50 +0000 (18:29 +0000)]
Merge "Use correct synchronization lock" into nyc-dev
am: 638cc6cac9

* commit '638cc6cac9e35ec5a1410ba2fd63550b53e699ab':
  Use correct synchronization lock

Change-Id: I834766e3191a2bc4cef1587714522031fe3f24de

8 years agoMerge "Use correct synchronization lock" into nyc-dev
Amith Yamasani [Tue, 24 May 2016 18:29:45 +0000 (18:29 +0000)]
Merge "Use correct synchronization lock" into nyc-dev
am: 638cc6cac9

* commit '638cc6cac9e35ec5a1410ba2fd63550b53e699ab':
  Use correct synchronization lock

Change-Id: Ibc7475f21c585ae457412214986cc14ac9ecbe8b

8 years agoDocs: Changed URL references of relocated test_framework.png am: b4c6f2b637
Adarsh Fernando [Tue, 24 May 2016 18:25:31 +0000 (18:25 +0000)]
Docs: Changed URL references of relocated test_framework.png am: b4c6f2b637
am: 9b81008076

* commit '9b810080769b26b1aecd97b96b3a1ffcd69341c1':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: Ibcd8728ed898c32cac19eeff5ab55cb919acc14d

8 years agoMerge "Merge "Register change Uri and notify changes in bugreportServices." into...
Ben Lin [Tue, 24 May 2016 18:24:41 +0000 (18:24 +0000)]
Merge "Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e am: 6d80e074ec" into nyc-mr1-dev-plus-aosp
am: d4a0910148

* commit 'd4a0910148fa511f451b3400f75a6df78e7818f2':

Change-Id: Id7c7763eab190c203dbcd7363d6dd89a9f5d4420

8 years agoMerge "Register change Uri and notify changes in bugreportServices." into nyc-dev...
Ben Lin [Tue, 24 May 2016 18:24:28 +0000 (18:24 +0000)]
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e am: 9c14d14f43
am: 44738dd376

* commit '44738dd3762fdd2ddd8ee997e51f3ab300019d91':
  Register change Uri and notify changes in bugreportServices.

Change-Id: Ie42852b75efd2f9a499924361b4eeb6416ec0ade

8 years agoMerge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
Felipe Leme [Tue, 24 May 2016 18:23:58 +0000 (18:23 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
am: 223d4fff18

* commit '223d4fff18002369fdc716ee2109f3e949563964':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I62eb108dfad2ac1ffd2b541470f01a7923d92731

8 years agoRely on Tethering mutex for TetherInterfaceSM
Christopher Wiley [Mon, 23 May 2016 20:58:00 +0000 (13:58 -0700)]
Rely on Tethering mutex for TetherInterfaceSM

Stop passing Tethering's mutex into TetherInterfaceSM, and instead
simply rely on Tethering to acquire its own mutex when accessing
instances of TetherInterfaceSM.

While here, remove some boolean fields (previously guarded by the mutex)
which duplicate state information.

Change-Id: Ie6b2128970981786a5d64fbf700c9f3d0a6721fb
Test: Compiles, unittests pass, WiFi tethering continues to work.
Bug: 28910007

8 years agoMerge "Merge "Register change Uri and notify changes in bugreportServices." into...
Android Build Merger (Role) [Tue, 24 May 2016 18:13:38 +0000 (18:13 +0000)]
Merge "Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e am: 6d80e074ec" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
Felipe Leme [Tue, 24 May 2016 18:13:16 +0000 (18:13 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
am: efd3a1749f

* commit 'efd3a1749f2737199643cc29bea6132a9786223b':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I87b596346c058c7ac8efbebb67b43664f1be0fed

8 years agoMerge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
Felipe Leme [Tue, 24 May 2016 18:13:14 +0000 (18:13 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
am: efd3a1749f

* commit 'efd3a1749f2737199643cc29bea6132a9786223b':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I5cd9701e6620abcc950f6a182b6e2b5f95127371

8 years agoMerge "Register change Uri and notify changes in bugreportServices." into nyc-dev...
Ben Lin [Tue, 24 May 2016 18:13:14 +0000 (18:13 +0000)]
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e
am: 6d80e074ec

* commit '6d80e074ec7c20e1e6a10fd67a4d409990f76fcb':
  Register change Uri and notify changes in bugreportServices.

Change-Id: Ic0e793c959ca9061e3367f2808205234ade908d7

8 years agoMerge "Register change Uri and notify changes in bugreportServices." into nyc-dev...
Ben Lin [Tue, 24 May 2016 18:11:46 +0000 (18:11 +0000)]
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev am: 5d5ddfa80e
am: 9c14d14f43

* commit '9c14d14f43caff0497c5c1edfa63527575a6f083':
  Register change Uri and notify changes in bugreportServices.

Change-Id: I9b77e4eb8b7d699a97a265244bb808f17c07e259

8 years agoDocs: Changed URL references of relocated test_framework.png
Adarsh Fernando [Tue, 24 May 2016 18:11:43 +0000 (18:11 +0000)]
Docs: Changed URL references of relocated test_framework.png
am: b4c6f2b637

* commit 'b4c6f2b63713c958e46b02b6c520271ec77fdda2':
  Docs: Changed URL references of relocated test_framework.png

Change-Id: Ief551478b2fa023cdea013c766017e3bc0eba79e

8 years agoMerge "Use correct synchronization lock" into nyc-dev
Amith Yamasani [Tue, 24 May 2016 18:10:56 +0000 (18:10 +0000)]
Merge "Use correct synchronization lock" into nyc-dev

8 years agoMerge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34...
Eric Laurent [Tue, 24 May 2016 18:02:35 +0000 (18:02 +0000)]
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34 am: a30335698c
am: 731eb18bd7

* commit '731eb18bd799685ef45a328f04fc678ee5a2f03d':

Change-Id: Ifaaa393f1f968013d8e26b65075a4d483de8c0f1

8 years agoMerge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34...
Eric Laurent [Tue, 24 May 2016 18:02:25 +0000 (18:02 +0000)]
Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev am: b143e3de34 am: 50103561d2
am: 45309a4a95

* commit '45309a4a950a0c46f8933481e22c16f1d618db4d':
  Fix AudioTrack and AudioRecord documentation

Change-Id: I9da5a69426b790bbf4a0c6a22ae894b7f1258220

8 years agoMerge "Fix wallpaper crop during unlock animation" into nyc-dev am: d4a45e0c40 am...
Chong Zhang [Tue, 24 May 2016 18:02:15 +0000 (18:02 +0000)]
Merge "Fix wallpaper crop during unlock animation" into nyc-dev am: d4a45e0c40 am: 863289d2cd
am: 8a83cbf3e5

* commit '8a83cbf3e5059d6b7aa3210303faad75c36a66ba':

Change-Id: Iae39452d1084522aee80fa47f457fd202194adac

8 years agoMerge "Register change Uri and notify changes in bugreportServices." into nyc-dev
Ben Lin [Tue, 24 May 2016 18:01:34 +0000 (18:01 +0000)]
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev
am: 5d5ddfa80e

* commit '5d5ddfa80ecb482e34ed4bfebae2c7308269a1c4':
  Register change Uri and notify changes in bugreportServices.

Change-Id: I02eadb5e4c4b7735bf3f1ac142e75a513f12ca85

8 years agoMerge "Register change Uri and notify changes in bugreportServices." into nyc-dev
Ben Lin [Tue, 24 May 2016 18:01:16 +0000 (18:01 +0000)]
Merge "Register change Uri and notify changes in bugreportServices." into nyc-dev
am: 5d5ddfa80e

* commit '5d5ddfa80ecb482e34ed4bfebae2c7308269a1c4':
  Register change Uri and notify changes in bugreportServices.

Change-Id: Ic118dd61f0471f61af3fe5fbace8a0dbae258484

8 years agoDoc: delete old test_framework.png
Adarsh Fernando [Tue, 24 May 2016 17:58:43 +0000 (10:58 -0700)]
Doc: delete old test_framework.png

- file now relocated to /studio/images/test/test-framework.png

Change-Id: Ieb2d93472e29741be73f104bf319911b09accf6f

8 years agoFix first notification of each app is not shown
Tony Mak [Tue, 24 May 2016 17:57:50 +0000 (18:57 +0100)]
Fix first notification of each app is not shown

When app tries to post its first notification,
value of now is equal to that of mLastEventTime.
And hence getRate return a very large number.

Bug: 28902358

Change-Id: If5b5b3c46e2bb80a9b40988ba7f7d777e40cc8e7

8 years agoMerge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev
TreeHugger Robot [Tue, 24 May 2016 17:51:35 +0000 (17:51 +0000)]
Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev