Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,399 Commits 3 Branches 0 Tags
7b30d790986fbb1df2fc6d441cf5000900b47b2e
Commit Graph

266399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrii Kulian
7b30d79098 Merge "Fix task selection logic" into nyc-dev am: 265bd89c3c am: f4b91fe3e1 
am: f17c14c657

* commit 'f17c14c657aeb796cc5bd2b7d8597b51c5f785dd':
  Fix task selection logic

Change-Id: Ifd1a62530754a33cbf3d39a28d5f23e5787e31ad
 2016-06-03 02:21:11 +00:00
Zhijun He
5745f4ce55 Merge "Camera2: add deferred output config support" into nyc-mr1-dev am: e8526a0105 
am: f103fd540e

* commit 'f103fd540e54dddc370aa1049424a7644c889e08':
  Camera2: add deferred output config support

Change-Id: I7662286b333ccce5e18399fd84efb07e167936ea
 2016-06-03 02:14:59 +00:00
Andrii Kulian
f17c14c657 Merge "Fix task selection logic" into nyc-dev am: 265bd89c3c 
am: f4b91fe3e1

* commit 'f4b91fe3e18b98e575cf498a5fdbcd8ad9603ce1':
  Fix task selection logic

Change-Id: I4d665fad6c972bdb11a192256d21f5fb9a27c96a
 2016-06-03 02:10:04 +00:00
Zhijun He
f103fd540e Merge "Camera2: add deferred output config support" into nyc-mr1-dev 
am: e8526a0105

* commit 'e8526a01051fc2b8929870c8bff28f1d6b8b652c':
  Camera2: add deferred output config support

Change-Id: I5bfa1c90e4ab5910ccd3a8727b95200e4b4221ca
 2016-06-03 02:07:10 +00:00
Andrii Kulian
f4b91fe3e1 Merge "Fix task selection logic" into nyc-dev 
am: 265bd89c3c

* commit '265bd89c3cb6f99d38d2f126a88c12fc6502431c':
  Fix task selection logic

Change-Id: Ic80d782ca53d8cf7a565a9337a686441edbd2c72
 2016-06-03 02:07:04 +00:00
Andrii Kulian
265bd89c3c Merge "Fix task selection logic" into nyc-dev 2016-06-03 01:37:52 +00:00
Zhijun He
e8526a0105 Merge "Camera2: add deferred output config support" into nyc-mr1-dev 2016-06-03 01:14:00 +00:00
Pankaj Kanwar
78a2a8a38d Merge "Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 am: fa790104f2" into nyc-mr1-dev-plus-aosp 
am: a5c78204eb

* commit 'a5c78204ebd39bd21a304ce9989b174388440796':

Change-Id: I1305cf2026c6e46d7d87915a81da7cc5fbf46f8f
 2016-06-03 01:08:35 +00:00
Pavlin Radoslavov
f805cc9c9b Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 am: c9e93d4294 
am: 51a440fa83

* commit '51a440fa83b87f0f841f88221fc03670b09cb89b':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: Ie34d0601901a50bba1ce7b0f5d8b736ac09ae026
 2016-06-03 01:08:31 +00:00
Android Build Merger (Role)
a5c78204eb Merge "Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 am: fa790104f2" into nyc-mr1-dev-plus-aosp 2016-06-03 01:05:03 +00:00
Pankaj Kanwar
97c4ee30e5 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 
am: fa790104f2

* commit 'fa790104f221563ebfd17813262c540b2751598c':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: I15c414be645c7aab9b2bd1262dd57b83ca8e652a
 2016-06-03 01:04:30 +00:00
Pankaj Kanwar
51a440fa83 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev am: 0bc61eb176 
am: c9e93d4294

* commit 'c9e93d42948bf3f9d4fce748b4c896a3a081bfde':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: I604d7fe975e3d7917014df470c9c42ada7d2808a
 2016-06-03 01:04:27 +00:00
Pavlin Radoslavov
fa790104f2 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 
am: 0bc61eb176

* commit '0bc61eb176644e243b0e131a29a5f66a4303d9b0':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: Ia2aed3304039a672961608fc900ab8996f67d716
 2016-06-03 01:00:35 +00:00
Pavlin Radoslavov
c9e93d4294 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 
am: 0bc61eb176

* commit '0bc61eb176644e243b0e131a29a5f66a4303d9b0':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: I8953c12b4df0a60bd3649a055a4dbe03c93534e5
 2016-06-03 01:00:34 +00:00
Pankaj Kanwar
0bc61eb176 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 2016-06-03 00:55:50 +00:00
Sanket Padawe
52a8d73d33 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev am: b68601d247 am: 701cd3fe15 
am: f4371f654b

* commit 'f4371f654bcab82a0cd0e2eedbcd3515eaaaf81c':

Change-Id: I66cce9a220281d115e96fa8598d808ee5a62b23b
 2016-06-03 00:53:21 +00:00
Sanket Padawe
f4371f654b Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev am: b68601d247 
am: 701cd3fe15

* commit '701cd3fe15148f561c27b9a2b65da79b6f36c1c8':

Change-Id: Ic8ee22af2923a4c8847966d34b7e03712bcfc09e
 2016-06-03 00:48:39 +00:00
Sanket Padawe
34884f3061 Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev am: 1a6b6fc266 
am: a255d5de80

* commit 'a255d5de80f460559e760a73f6f28fca85594eab':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I8331df0c8c9a2e830554d7a29e6f39b9a026c28f
 2016-06-03 00:48:10 +00:00
Todd Kennedy
d2bbc1e2a0 Merge "Round icons" into nyc-mr1-dev am: 7d64d64269 
am: a84b5d0ebd

* commit 'a84b5d0ebdeb7d4d5670d490380f5a7a48282b90':
  Round icons

Change-Id: Iff9a17b9f826053c31aaa6ada8fb167f8e4520b5
 2016-06-03 00:44:54 +00:00
Adam Lesinski
5fcfdab573 Merge "Allow uses-library under <application>" into nyc-mr1-dev am: c878fb0cb8 
am: b80680af78

* commit 'b80680af787dfb27e5a4b1b0edae8502373c4935':
  Allow uses-library under <application>

Change-Id: I078857ace29f7f35b9efbee99f4278b7c7ba9c9e
 2016-06-03 00:44:51 +00:00
Sanket Padawe
a255d5de80 Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev 
am: 1a6b6fc266

* commit '1a6b6fc2664305de6e7102fa96506910fb7705dd':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I2d9db536538179a4fdca78613408dfd492b822b4
 2016-06-03 00:44:49 +00:00
Todd Kennedy
a84b5d0ebd Merge "Round icons" into nyc-mr1-dev 
am: 7d64d64269

* commit '7d64d642692ff6728ee83e1a0d8658909d1bdd44':
  Round icons

Change-Id: I5578f3eb7b7ffc7791a5a4305b0defba38963bba
 2016-06-03 00:38:26 +00:00
Adam Lesinski
b80680af78 Merge "Allow uses-library under <application>" into nyc-mr1-dev 
am: c878fb0cb8

* commit 'c878fb0cb8a901aae71d965a57e75e682eb6f67f':
  Allow uses-library under <application>

Change-Id: Iaa1f6acb21ec2426a9b8e935efd71cd877bed667
 2016-06-03 00:38:23 +00:00
Sanket Padawe
1a6b6fc266 Merge "Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d" into nyc-mr1-dev 2016-06-03 00:34:03 +00:00
TreeHugger Robot
7d64d64269 Merge "Round icons" into nyc-mr1-dev 2016-06-03 00:32:35 +00:00
Adam Lesinski
c878fb0cb8 Merge "Allow uses-library under <application>" into nyc-mr1-dev 2016-06-03 00:31:37 +00:00
Zhijun He
c8b181e95d Camera2: add deferred output config support 
Allow surfaces to be deferred during session creation. Once the surfaces are ready,
the application can finish the deferred output configuration to be able to submit
requests with these surface targets.

Bug: 28323863
Change-Id: Id6634c3ef2ecc84422a88f63de0a19a0cb496e96
 2016-06-02 17:30:20 -07:00
Suprabh Shukla
296a6319b5 Merge "Adding an idle timeout to restart demo session" into nyc-mr1-dev am: 67f82d16ea 
am: 0f4ae5e1a6

* commit '0f4ae5e1a6600763a6ac0180b4bde7e20b041a97':
  Adding an idle timeout to restart demo session

Change-Id: Ib0c2b6641134c91a03b374a2c59d7b3642b6385e
 2016-06-03 00:28:14 +00:00
Suprabh Shukla
0f4ae5e1a6 Merge "Adding an idle timeout to restart demo session" into nyc-mr1-dev 
am: 67f82d16ea

* commit '67f82d16ea31f309b402b3a96bafcc9338528ece':
  Adding an idle timeout to restart demo session

Change-Id: I11db70fd323fb908aa137dedf1817fa28b577d79
 2016-06-03 00:23:14 +00:00
Sanket Padawe
a7f74b1d43 Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d 
Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968
 2016-06-02 17:20:08 -07:00
TreeHugger Robot
67f82d16ea Merge "Adding an idle timeout to restart demo session" into nyc-mr1-dev 2016-06-03 00:18:18 +00:00
Adam Lesinski
fee32d4d5f Allow uses-library under <application> 
Bug:29106952
Change-Id: I2e780323d86e7050038d34426a30e66a4bbfcc23
 2016-06-02 23:57:55 +00:00
Sanket Padawe
701cd3fe15 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev 
am: b68601d247

* commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I3a83554dd14fe424706ec14853480f52569ff431
 2016-06-02 23:15:57 +00:00
Sanket Padawe
b68601d247 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev 2016-06-02 23:11:23 +00:00
Svetoslav Ganov
186a7a492d Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff am: bd28e027ed 
am: 47b2ecddee

* commit '47b2ecddee3a3dedfd1781b6fc44666acce64927':

Change-Id: I43b83550342543014486446ced6adb12d26b72e0
 2016-06-02 23:03:43 +00:00
Todd Kennedy
bb8a42da70 Round icons 
Allow applications to specify "android:roundIcon" in all places
they can already specify the rectangular "android:icon".

Bug: 28981414
Change-Id: I167163d650db80f4949274d365e7fee9aceacb3a
 2016-06-02 15:57:54 -07:00
Makoto Onuki
fdb40b93bb Merge "Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev am: f6be4c023f" into nyc-mr1-dev-plus-aosp 
am: 7d9b79c41b

* commit '7d9b79c41b53a8f936cb50be40c57a13412197bb':
  ShortcutManager: Break down unit tests

Change-Id: If4e742401c1fa02f48d086f9cbdf50d8100e4f16
 2016-06-02 22:57:50 +00:00
Philip P. Moltmann
694f4ada45 Merge "Merge "Do not rotate PDFPrinter pages." into nyc-dev am: 5d6a4f582e am: 1eabaff2cb" into nyc-mr1-dev-plus-aosp 
am: 951ff25d95

* commit '951ff25d95b81990a4a5ae96ae76032cdb745cf5':

Change-Id: I364760f36ce53d06837947929355ae66a1eb6ffc
 2016-06-02 22:57:47 +00:00
Svetoslav Ganov
47b2ecddee Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff 
am: bd28e027ed

* commit 'bd28e027ed87da6cdc2313481439aeab021b2820':

Change-Id: Ieba2c125f5ea43ee9fe345a48e86415a55c1df5d
 2016-06-02 22:56:48 +00:00
Svetoslav Ganov
0649158cad Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff am: 13f802dc01 
am: a8cdb6f645

* commit 'a8cdb6f6453d23f915d5c470bbdf1000153df383':
  Properly set default voice interactor

Change-Id: I6310a3da7aeb0b8b78918399ef79a0fcc91d4792
 2016-06-02 22:52:13 +00:00
Philip P. Moltmann
e853237b67 Merge "Do not rotate PDFPrinter pages." into nyc-dev am: 5d6a4f582e am: bf0f82bd69 
am: e34a1df1ad

* commit 'e34a1df1ad0699997399666ce58d4750cbabe1b0':
  Do not rotate PDFPrinter pages.

Change-Id: If5ba09a6d2985e1ffb402329773fd42fa6a25e1b
 2016-06-02 22:52:10 +00:00
Android Build Merger (Role)
7d9b79c41b Merge "Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev am: f6be4c023f" into nyc-mr1-dev-plus-aosp 2016-06-02 22:48:19 +00:00
Android Build Merger (Role)
951ff25d95 Merge "Merge "Do not rotate PDFPrinter pages." into nyc-dev am: 5d6a4f582e am: 1eabaff2cb" into nyc-mr1-dev-plus-aosp 2016-06-02 22:48:09 +00:00
Makoto Onuki
2f5430d6a1 Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev 
am: f6be4c023f

* commit 'f6be4c023fbd29d14fdd0b8df6b939b8a46cf553':
  ShortcutManager: Break down unit tests

Change-Id: I31bb7fb30e4de121447acbe1ec5915cde6ae4f7f
 2016-06-02 22:47:32 +00:00
Svetoslav Ganov
a8cdb6f645 Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff 
am: 13f802dc01

* commit '13f802dc013866986be51328af21378783d19e61':
  Properly set default voice interactor

Change-Id: I29c2a1490877d4b25ca64fee8a53c6970d07a1f2
 2016-06-02 22:47:29 +00:00
Philip P. Moltmann
1889358444 Merge "Do not rotate PDFPrinter pages." into nyc-dev am: 5d6a4f582e 
am: 1eabaff2cb

* commit '1eabaff2cb9f97c412102a564bc90ce47a8b2adb':
  Do not rotate PDFPrinter pages.

Change-Id: I1988f9f05ca1c16f0aac11b3e58d5b3c9b673985
 2016-06-02 22:47:27 +00:00
Svetoslav Ganov
bd28e027ed Merge "Properly set default voice interactor" into nyc-dev 
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: Ifcad5647ee8ab09765fe89f40693eb335996982a
 2016-06-02 22:47:26 +00:00
Philip P. Moltmann
e34a1df1ad Merge "Do not rotate PDFPrinter pages." into nyc-dev am: 5d6a4f582e 
am: bf0f82bd69

* commit 'bf0f82bd69433a018fc767fa7bd8ca5145927610':
  Do not rotate PDFPrinter pages.

Change-Id: Ied59f3b9e33e2ff03d1760f6f2958821ba82dda9
 2016-06-02 22:47:26 +00:00
Svetoslav Ganov
13f802dc01 Merge "Properly set default voice interactor" into nyc-dev 
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: I1e9d7488ecac8569a585e00ebc7c45df1b1833c3
 2016-06-02 22:43:41 +00:00
Makoto Onuki
f6be4c023f Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev 2016-06-02 22:42:03 +00:00