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

282582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Justin Klaassen
f8a10959d2 Enable SMS in carrier demo mode 
Fixes: 34861667
Test: manually verified default SMS app works in carrier demo mode.
Change-Id: Ic6f1065954e5bb54c6b78b3d604811333f6863e4
 2017-01-31 19:40:40 -08:00
Peter Qiu
3e6c9c9462 Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad am: 9e7725040b 
am: ec61beaa7a

Change-Id: I26269af9bf18789ce40858df0645e17867f44469
 2017-02-01 03:37:58 +00:00
Jeremy Joslin
499f1f39ff Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08dae 
am: 9c245a51f7

Change-Id: I33a60ce4525561705572ebaa0fe1851d46c24b63
 2017-02-01 03:32:27 +00:00
Peter Qiu
ebafa7c813 Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191 
am: 28630218cc

Change-Id: I264d4664bc9e69d9c70dce7ffcf75e3ae2e2e430
 2017-02-01 03:30:58 +00:00
Peter Qiu
ec61beaa7a Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad 
am: 9e7725040b

Change-Id: I5b36bb042933a0a889b7f84281b174a7527ccaff
 2017-02-01 03:30:51 +00:00
Jeremy Joslin
9c245a51f7 Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 
am: ba4bc08dae

Change-Id: I3f7e2a6ecdbe04fad0358fadecdeb8341baa99eb
 2017-02-01 03:25:47 +00:00
Peter Qiu
28630218cc Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca 
am: 4ed5fe8191

Change-Id: I678ec9518c7c88acefd1bb99bcb3add27ca52b87
 2017-02-01 03:24:04 +00:00
Peter Qiu
9e7725040b Merge "hotspot2: implement hashCode() for classes with equals() function" 
am: 2ac992fcad

Change-Id: I15cec4598a8a97b25c6b8ce62864ccb6b240bfde
 2017-02-01 03:19:27 +00:00
Treehugger Robot
2ac992fcad Merge "hotspot2: implement hashCode() for classes with equals() function" 2017-02-01 03:12:13 +00:00
Lorenzo Colitti
b8d609eb82 Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f am: 2ec8b8bcb6 am: 8fcc6a34f0 
am: 10d3007e66

Change-Id: I94fc11a6fba6a9ee47e130284c8abea64244f8a2
 2017-02-01 03:02:51 +00:00
Lorenzo Colitti
6e7f7dc643 ConnectivityServiceTest: remove remaining poll loops. am: d2706127d0 am: 54e9050710 
am: 67d6d41954

Change-Id: I31681e1248721704a9b792962a2ef5955e375e93
 2017-02-01 03:01:52 +00:00
Lorenzo Colitti
4fc1296cef Remove assertEventuallyTrue as it's unnecessary. am: 30145d755c am: 90a70cac26 
am: 90babed246

Change-Id: Ib16f54aeaa783a6e26a9d80e61388cbd9ecd9bd3
 2017-02-01 03:00:41 +00:00
Lorenzo Colitti
d526434f05 Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am: 58ebe1c6f1 am: 0bc8070fce 
am: 338241de94

Change-Id: I91f1338f3488cfc60eef0c2147aa7b1d61107cdd
 2017-02-01 02:59:42 +00:00
Lorenzo Colitti
8e3718459b Attempt to make waitForIdleHandler reliable. am: ae3ce81cc3 am: 8780a8afeb 
am: 943808385a

Change-Id: I2369fbd693b467283232f47703fd471c8ff60c1f
 2017-02-01 02:58:24 +00:00
Jeremy Joslin
ba4bc08dae Merge "Print the package name and creator UID in dump()." 
am: cf7f9dd6a1

Change-Id: Ifd7812ff0acba03544a05a3fcea7721da8fe7d0f
 2017-02-01 02:50:25 +00:00
Lorenzo Colitti
10d3007e66 Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f am: 2ec8b8bcb6 
am: 8fcc6a34f0

Change-Id: If547b83ddc48d5a0c30ad172bbb2406885d1d5ee
 2017-02-01 02:50:19 +00:00
Lorenzo Colitti
67d6d41954 ConnectivityServiceTest: remove remaining poll loops. am: d2706127d0 
am: 54e9050710

Change-Id: I06815166fe9ab4b7d6ab580a9eda5304067f9f91
 2017-02-01 02:49:23 +00:00
Lorenzo Colitti
90babed246 Remove assertEventuallyTrue as it's unnecessary. am: 30145d755c 
am: 90a70cac26

Change-Id: I7f6d543a3d05b0b165adc7a7c3938c7081c3f778
 2017-02-01 02:48:10 +00:00
Lorenzo Colitti
338241de94 Rename AvoidBadWifiTracker to MultinetworkPolicyTracker am: 58ebe1c6f1 
am: 0bc8070fce

Change-Id: I0ff0169ebc5e53cc9f57f224225fb0c93dc241ed
 2017-02-01 02:47:16 +00:00