Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
282,603 Commits 3 Branches 0 Tags
6776f79012185ba2917d7971ca810062702a2e92
Commit Graph

282603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugo Benichi
6776f79012 Revert "Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e am: 7b39349792" 
This reverts commit 814a59ba82 because it broke the build by duplicating code that was already there.

Change-Id: I1e32fd9e70629e5725e503ca372fb20c0aa0035d
 2017-02-02 07:32:16 +00:00
Hugo Benichi
814a59ba82 Merge "Define Network notification proto constants." am: 05550d9ed8 am: 6236f49f0e 
am: 7b39349792

Change-Id: I3d475b36e505e402d18a3942f557e2823d21416f
 2017-02-02 06:52:37 +00:00
Hugo Benichi
7b39349792 Merge "Define Network notification proto constants." am: 05550d9ed8 
am: 6236f49f0e

Change-Id: Ibb7620ea6946c2649d053859a2a1b55fbb78ed12
 2017-02-02 06:47:35 +00:00
Hugo Benichi
6236f49f0e Merge "Define Network notification proto constants." 
am: 05550d9ed8

Change-Id: I3a169ace694ed42c59f3d818f007b638fdf4969f
 2017-02-02 06:42:32 +00:00
Hugo Benichi
05550d9ed8 Merge "Define Network notification proto constants." 2017-02-02 06:36:22 +00:00
Erik Kline
2ebea21074 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5 am: 180a3d07a8 
am: d85f448274

Change-Id: Ia629aa5dbdf10566c28525d9a05b096482db3f2d
 2017-02-02 05:25:05 +00:00
Erik Kline
d85f448274 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5 
am: 180a3d07a8

Change-Id: I9f80a3ff713b4b00136808051a717509f600bb9a
 2017-02-02 05:20:05 +00:00
Erik Kline
180a3d07a8 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" 
am: 603eefd5d5

Change-Id: I6b2a0d6df70df028ef9b8ff5d689c5a627d8daf8
 2017-02-02 05:15:23 +00:00
Treehugger Robot
603eefd5d5 Merge "Add test for repeated calls to registerMobileUpstreamRequest()" 2017-02-02 05:07:23 +00:00
Suprabh Shukla
a843ab955c DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 am: 029364c505 am: 2f1b2d82ca am: ac8f44e387 
am: 3ee26841fd

Change-Id: I7b4d65cc7a3d1b4f575d885e1c71b40a52cc90a4
 2017-02-02 03:03:20 +00:00
Suprabh Shukla
3ee26841fd DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 am: 029364c505 am: 2f1b2d82ca 
am: ac8f44e387

Change-Id: I7e4376740ddf167035a3274c19ca5ae3f113a9b0
 2017-02-02 02:57:58 +00:00
Suprabh Shukla
ac8f44e387 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 am: 029364c505 
am: 2f1b2d82ca

Change-Id: I8094afc5c919b65d7f180ef9d3ad875f3ea4dacf
 2017-02-02 02:53:21 +00:00
Suprabh Shukla
2f1b2d82ca DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 
am: 029364c505

Change-Id: Ibef494c57a80a7b0d871dd8a80f877816e6897d0
 2017-02-02 02:48:23 +00:00
Suprabh Shukla
029364c505 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours 
am: 773f85ec60

Change-Id: Ie83cb2dfd89fd808e906a802e16fd1943a898012
 2017-02-02 02:43:24 +00:00
Suprabh Shukla
773f85ec60 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab 
am: 588411fc7c  -s ours

Change-Id: I1511e5dff681d06161cd18b78e7edaf7eddb897a
 2017-02-02 02:38:24 +00:00
Suprabh Shukla
588411fc7c DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 
am: 2e6bdbeaab

Change-Id: I7e286445a887e467a7de42ce9b27a9dc009e47fd
 2017-02-02 02:32:48 +00:00
Suprabh Shukla
2e6bdbeaab DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 
am: ab8d3febd3

Change-Id: If42411391fe2010162c51adf48e720e308a650ec
 2017-02-02 02:28:13 +00:00
Suprabh Shukla
ab8d3febd3 DO NOT MERGE Do not call RecoverySystem with DPMS lock held 
am: 4ffe72dcc8

Change-Id: Ic7b9ef6484df0b57c8f1ee7a483ef3bda05c7cc7
 2017-02-02 02:21:16 +00:00
Makoto Onuki
62c651d4d5 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc am: 963cba5b5b am: f1e276384d 
am: 46bfcb9961  -s ours

Change-Id: Ie1cd5114414daeb1216827563333ed91df873604
 2017-02-02 01:25:19 +00:00
Makoto Onuki
46bfcb9961 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc am: 963cba5b5b 
am: f1e276384d

Change-Id: I856ad657b894531f03bc145e033b0cebf4e722cd
 2017-02-02 01:19:52 +00:00
Makoto Onuki
f1e276384d DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc 
am: 963cba5b5b

Change-Id: I3a1421f656d1a90970eac6156e0840625662fb17
 2017-02-02 01:15:44 +00:00
Makoto Onuki
963cba5b5b DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc 
am: 01f971dcdc

Change-Id: If5f5e5d47b97e2b8480adc5ca2cb08702056ca87
 2017-02-02 01:10:43 +00:00
Makoto Onuki
01f971dcdc DO NOT MERGE Do not call RecoverySystem with DPMS lock held 
am: 2317451acc

Change-Id: Id3441141d4feea4c7291350c9670bd59ec017240
 2017-02-02 01:03:21 +00:00
Steven Moreland
8bb391016b Merge "Cleanup hwbinder getService code." am: 9be24a3040 am: 4ede371d80 
am: ec840d1464

Change-Id: I83a7077f07689dc57ac4d8828508443cc4385292
 2017-02-01 21:03:54 +00:00
Steven Moreland
ec840d1464 Merge "Cleanup hwbinder getService code." am: 9be24a3040 
am: 4ede371d80

Change-Id: Ia0f3f88d8881f89cec6939dbb44d7dbbb8da9a7f
 2017-02-01 20:57:59 +00:00
Steven Moreland
4ede371d80 Merge "Cleanup hwbinder getService code." 
am: 9be24a3040

Change-Id: Idb75f2c41e6e0fd9c2eb03ef4960e40cb6556308
 2017-02-01 20:53:24 +00:00
Treehugger Robot
9be24a3040 Merge "Cleanup hwbinder getService code." 2017-02-01 20:46:45 +00:00
Brad Ebinger
aca8a2a707 Merge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91 am: 9f1ccbf5f9 
am: cb8180033a

Change-Id: If5baf2ffc7b4010c6598ec730d48602b48738cc2
 2017-02-01 19:53:27 +00:00
Brad Ebinger
cb8180033a Merge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91 
am: 9f1ccbf5f9

Change-Id: If9be849f743e9722ca49543a92d33d09978dc6ce
 2017-02-01 19:49:24 +00:00
Brad Ebinger
9f1ccbf5f9 Merge "Turn off Dynamic IMS switching for now" 
am: 2bb0d95e91

Change-Id: Ie74b53ca5f0b6463b371368608c793d402878d50
 2017-02-01 19:44:55 +00:00
Brad Ebinger
3aaf673c60 Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d am: 6734275c2f 
am: fa1dca0ad6

Change-Id: Id2875b5b60401405e31e76eb07968798144df700
 2017-02-01 19:42:16 +00:00
Brad Ebinger
2bb0d95e91 Merge "Turn off Dynamic IMS switching for now" 2017-02-01 19:36:48 +00:00
Brad Ebinger
fa1dca0ad6 Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d 
am: 6734275c2f

Change-Id: I6d502db3362aafcfed426b6598be0bd39dd38890
 2017-02-01 19:35:56 +00:00
Brad Ebinger
6734275c2f Merge "Adds @hide permission granting API for ImsServices" 
am: 390ec27f9d

Change-Id: I0f3d38811925884681d11cf18e12f1b0574d64c6
 2017-02-01 19:30:41 +00:00
Treehugger Robot
390ec27f9d Merge "Adds @hide permission granting API for ImsServices" 2017-02-01 19:24:11 +00:00
Steven Moreland
2f379ca7d9 Cleanup hwbinder getService code. 
- Remove memory leaks.
- Make sure proper errors are getting thrown.
- Avoid SIGABRT

Test: hidl_test_java
Change-Id: Ia5680fd0ebf83d0f174bf0d8109bf60327be5f9d
 2017-02-01 10:42:23 -08:00
Android Build Merger (Role)
da5289b6ed Merge "Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52" into nyc-mr2-dev-plus-aosp 2017-02-01 18:03:11 +00:00
Nimrod Gileadi
0dea9e896f Add Wear keycodes to emulator key layout file. am: 119a06ce55 
am: c85e503d52

Change-Id: I6840265835199d454d735e443fb53228c0ae2fd2
 2017-02-01 18:02:17 +00:00
Nimrod Gileadi
00620e70d5 Add Wear keycodes to emulator key layout file. am: 119a06ce55 
am: 9576ce6696

Change-Id: Ic10c9e353a264c60cef3dac79a2fc4b57eebb244
 2017-02-01 18:01:45 +00:00
Nimrod Gileadi
9576ce6696 Add Wear keycodes to emulator key layout file. 
am: 119a06ce55

Change-Id: I33d2b0f9b8281c22422677f03d6046a1be0bd94f
 2017-02-01 17:57:16 +00:00
Nimrod Gileadi
c85e503d52 Add Wear keycodes to emulator key layout file. 
am: 119a06ce55

Change-Id: Ieb06380c3bd43af7087463543960cc4ee1889050
 2017-02-01 17:57:11 +00:00
Erik Kline
7462f467c1 Add test for repeated calls to registerMobileUpstreamRequest() 
Test: as follows
    - built
    - flashed
    - booted
    - runtest framework-net passes
Bug: 32163131

Change-Id: I6d2519601b7a9dcfda2917118214a7ceb9dbbb7f
 2017-02-01 21:30:15 +09:00
Nimrod Gileadi
119a06ce55 Add Wear keycodes to emulator key layout file. 
The SLEEP keycode is used by Android Wear to indicate a
"palming" gesture (covering the screen with one's hand).

The STEM_* buttons are used for side buttons on Wear.

The keycode values were added to the emulator in
http://r.android.com/330771

Bug: 19996432
Change-Id: Ib90c3b27209b0059ebc1c2cce46cc732a677d557
 2017-02-01 12:13:12 +00:00
George Burgess IV
142eacb409 Merge "Fix a use-of-uninitialized-value warning" am: 53873df5fe am: aea873ade0 
am: 820768f034

Change-Id: Id9b31425cb8ba05687ff7dfa392b230865ec18e5
 2017-02-01 07:27:15 +00:00
George Burgess IV
820768f034 Merge "Fix a use-of-uninitialized-value warning" am: 53873df5fe 
am: aea873ade0

Change-Id: I747d94158c8a1c77f8ae1076c93a3d22f6c22ef5
 2017-02-01 07:21:51 +00:00
George Burgess IV
aea873ade0 Merge "Fix a use-of-uninitialized-value warning" 
am: 53873df5fe

Change-Id: I102fb345244f922cb41a5ce31b2de0af8e68bf97
 2017-02-01 07:15:00 +00:00
Treehugger Robot
53873df5fe Merge "Fix a use-of-uninitialized-value warning" 2017-02-01 07:09:51 +00:00
Justin Klaassen
c21a98dee0 Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev 
am: 42dfcc772b

Change-Id: I8d36badab79c40e5a65a88ca4ed418409cd17e24
 2017-02-01 05:21:01 +00:00
Justin Klaassen
d9a1ed0cfb Enable SMS in carrier demo mode 
am: f8a10959d2

Change-Id: Icc96ba3c6fafa5df0327297ed81f8c8dff8818fe
 2017-02-01 05:20:56 +00:00
TreeHugger Robot
42dfcc772b Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev 2017-02-01 05:14:02 +00:00