Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
283,610 Commits 3 Branches 0 Tags
3fbcd8cf38f41f3dd303276fe11bbba3ac2bfa67
Commit Graph

283610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
3fbcd8cf38 Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" 
am: 372b6b2c45

Change-Id: Iafa345df241f4f713451aa42a7169eddb57eb1ea
 2017-02-20 15:59:06 +00:00
Treehugger Robot
372b6b2c45 Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" 2017-02-20 15:47:53 +00:00
Paul Duffin
0589d8287e Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue() 
The previous changes to these files, which inlined the behavior
of Assert.assertTrue() were done in a hurry to fix the build.
This change makes use of the existing Utils.assertTrue() method
that was created for this purpose.

Bug: 30188076
Test: make checkbuild
Change-Id: Iacd505f8c3f7cefe6de94d30b56e39600bb9b0af
 2017-02-20 13:27:38 +00:00
Paul Duffin
e4add524e9 Merge "Avoid using JUnit code in production WallpaperCropper" 
am: 9598c98db0

Change-Id: I15b0bbe22d18feca699ecaf4146dc9e2c279e5b5
 2017-02-20 12:48:55 +00:00
Paul Duffin
9598c98db0 Merge "Avoid using JUnit code in production WallpaperCropper" 2017-02-20 12:40:18 +00:00
Paul Duffin
c36ff4cf4f Avoid using JUnit code in production WallpaperCropper 
Bug: 30188076
Test: make checkbuild
Change-Id: Ib6fe445a246d15dbabb8b86f9251b0059ed216b5
 2017-02-20 12:37:35 +00:00
Tetsutoki Shiozawa
add56f7b66 Merge "Apply RTL layout to the title of ResolverActivity" 
am: 2122e42e9b

Change-Id: Ibf9e9d7a0a397e314588322b5c8228cf5fa23957
 2017-02-18 00:07:27 +00:00
Colin Cross
11436455cf Merge "WallpaperCropper has no tests, it doesn't need junit" 
am: a34472b7e6

Change-Id: I1a2c5018f2f85bb21fccdccd3c736fdc844dcf92
 2017-02-17 23:57:56 +00:00
Treehugger Robot
2122e42e9b Merge "Apply RTL layout to the title of ResolverActivity" 2017-02-17 23:57:25 +00:00
Colin Cross
a34472b7e6 Merge "WallpaperCropper has no tests, it doesn't need junit" 2017-02-17 23:49:03 +00:00
Pulkit Bhuwalka
806ac5e1dd Merge "Remove outdated emulator check which causes BT to not start" 
am: ad7fb62d4f

Change-Id: Ia6f9417e6b21ec7911036b8875b9603f8b36152e
 2017-02-17 23:28:09 +00:00
Treehugger Robot
ad7fb62d4f Merge "Remove outdated emulator check which causes BT to not start" 2017-02-17 23:20:25 +00:00
Colin Cross
3c2c2764d4 Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2 
am: 313e645801

Change-Id: Ia10d20ea4ebabc2cc84524950dec7570104b185f
 2017-02-17 22:25:53 +00:00
Yuxin Chang
4896a04013 Merge "Show connection error reason for Passpoint AP" 
am: 855889b086

Change-Id: I164f575dfc5dd69912f433e46b1d70b1fd11b1e6
 2017-02-17 22:22:05 +00:00
Etan Cohen
8e32c1b718 Merge "[AWARE] Remove enableUsage/disableUsage API" 
am: 647f2e1493

Change-Id: Ic48804f3e2ecac6a817d261f9f9cbfc505b01716
 2017-02-17 22:18:32 +00:00
Etan Cohen
f8637d5c04 Merge "[AWARE] Add discovery window period configuration" 
am: 17532ec02e

Change-Id: I62ba5123aafb236d756a4cafe7829717e8e542f9
 2017-02-17 22:15:29 +00:00
Pulkit Bhuwalka
d98a4e5021 Remove outdated emulator check which causes BT to not start 
ro.kernel.qemu based check to determine whether Bluetooth should be
started or not was an old hack used when "features" was not available to
determine hardware availability. This was later fixed with the
hasSystemFeature check. However, the old check was not removed.

The presence of the old check causes Bluetooth to not start on Android
Things devices which have ro.kernel.qemu set for graphics usage. It's
also preferable to depend on the system API rather than on build
configs. Related CLs modify the emulator builds to correct the config in
builds.

Bug: 35361545
Change-Id: I219ce5e14709c76dcba43af4693093e985269d43
Test: Verified by launching bluetooth on local devices after removing
the old check. Also verified by booting up the emulator and verifying
that Bluetooth Services do not start.
 2017-02-17 13:44:33 -08:00
Colin Cross
313e645801 Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2 
* changes:
  Enable multidex for SystemUITests
  Add missing transitive dependencies
  Revert "Remove support of disabling Jack."
 2017-02-17 21:44:21 +00:00
Treehugger Robot
855889b086 Merge "Show connection error reason for Passpoint AP" 2017-02-17 21:34:35 +00:00
Etan Cohen
647f2e1493 Merge "[AWARE] Remove enableUsage/disableUsage API" 2017-02-17 21:33:40 +00:00
Etan Cohen
17532ec02e Merge "[AWARE] Add discovery window period configuration" 2017-02-17 21:26:04 +00:00
Leonard Mosescu
5d2af16008 Merge "Add missing break statement." am: 7a4b88de49 
am: 080456edd6

Change-Id: I2acd644f0bb5916f9c90a1103b023544a7eebddb
 2017-02-17 20:34:48 +00:00
Leonard Mosescu
080456edd6 Merge "Add missing break statement." 
am: 7a4b88de49

Change-Id: I3323063130b71f831d7c6356d0657161f84c9e38
 2017-02-17 20:31:15 +00:00
Hiroaki Kuriyama
2ab70d213b Merge "PrintSpooler: Remove recommendation if Play Store is not installed" am: 57b966eee1 
am: 7cd04745f4

Change-Id: I04a0d5afbaedbef3a1d7b005dba124888fd213ca
 2017-02-17 20:30:36 +00:00
Brad Ebinger
c9c8b590c5 Merge "Adds @hide ImsService APIs" am: 2b879016d3 
am: f46aa6f9ee

Change-Id: I12e10d796a7b2d56cacf8e9b53bb5e228b79ecc3
 2017-02-17 20:29:13 +00:00
Leonard Mosescu
7a4b88de49 Merge "Add missing break statement." 2017-02-17 20:22:07 +00:00
Hiroaki Kuriyama
7cd04745f4 Merge "PrintSpooler: Remove recommendation if Play Store is not installed" 
am: 57b966eee1

Change-Id: I48c070c4b3e1cf3d1d6ff71612c7ad6d44e6cb1f
 2017-02-17 19:52:32 +00:00
Treehugger Robot
57b966eee1 Merge "PrintSpooler: Remove recommendation if Play Store is not installed" 2017-02-17 19:45:06 +00:00
Brad Ebinger
f46aa6f9ee Merge "Adds @hide ImsService APIs" 
am: 2b879016d3

Change-Id: Ia8b557ee006d3ffdbbe420934b97b0e7feb2ca80
 2017-02-17 19:33:02 +00:00
Treehugger Robot
2b879016d3 Merge "Adds @hide ImsService APIs" 2017-02-17 19:21:45 +00:00
Orion Hodson
2dc835dd1c Merge "Update dalvik.bytecode package" am: 3f827b5e33 am: fd63280dd2 
am: 2e6a473f20

Change-Id: I22a1e489d2597bfe0ed4b1f93a39128b29a08be5
 2017-02-17 18:33:21 +00:00
Orion Hodson
2e6a473f20 Merge "Update dalvik.bytecode package" am: 3f827b5e33 
am: fd63280dd2

Change-Id: If0728a4f838a275860e32f078822554815e31f22
 2017-02-17 18:27:29 +00:00
Orion Hodson
fd63280dd2 Merge "Update dalvik.bytecode package" 
am: 3f827b5e33

Change-Id: I94a28f57f36af1528e04f1af9eb9239cee8eeee6
 2017-02-17 18:20:18 +00:00
Treehugger Robot
3f827b5e33 Merge "Update dalvik.bytecode package" 2017-02-17 18:13:42 +00:00
Leonard Mosescu
456d5fc159 Add missing break statement. 
It was caught in the code review after the merge (thanks Narayan!).
This is already fixed and tested in the internal branch (see Merged-In)

Test: manual, CTS in internal

Change-Id: I9f6f72995e9ab633564b6bc22846fbe99eb65105
Merged-In: If14126e645b2d0a1307404e2f50088b3994abce2
 2017-02-17 10:10:55 -08:00
Orion Hodson
7d1bdf8375 Update dalvik.bytecode package 
BUG: 33191717
Test: m checkapi
Change-Id: I6af2b36573f698ae091e9d7e3f01c156549834c1
 2017-02-17 14:55:25 +00:00
sj.cha
395f0de0dc Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570fe8 am: 3b92631a69 
am: 10957727f5

Change-Id: I5e0faee7a0b1c6bdfafe77560a91e999f40edc4a
 2017-02-17 13:27:04 +00:00
sj.cha
10957727f5 Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570fe8 
am: 3b92631a69

Change-Id: I82c297e654af6690c6a3be216a0da08a3aff5b9d
 2017-02-17 13:21:34 +00:00
sj.cha
3b92631a69 Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" 
am: 1a69570fe8

Change-Id: I21a69eb02b13b20f66996836d54b8aadadfa80ec
 2017-02-17 13:17:00 +00:00
Treehugger Robot
1a69570fe8 Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" 2017-02-17 13:07:21 +00:00
Bill Yi
53c71a90fb Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: d4177b8610  -s ours

Change-Id: I73ba26823b2c27cf1f492558bf6b7c176c296282
 2017-02-17 10:24:43 +00:00
TreeHugger Robot
d4177b8610 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-17 10:16:42 +00:00
Bill Yi
5871f5ec47 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: d74b5f551d  -s ours

Change-Id: Iffab34c61046aeeca37a906107f4183952156654
 2017-02-17 09:19:10 +00:00
TreeHugger Robot
d74b5f551d Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-17 09:10:42 +00:00
Bill Yi
94a1e0fca6 Import translations. DO NOT MERGE 
Change-Id: Ia854a721fe3df7212deb75df8ab7c4adb5b531c1
Auto-generated-cl: translation import
 2017-02-16 21:18:39 -08:00
Bill Yi
deb08a3096 Import translations. DO NOT MERGE 
Change-Id: I80580cf6ece02cc20f4cda744f2b3599ec3985cd
Auto-generated-cl: translation import
 2017-02-16 21:09:53 -08:00
Etan Cohen
6bb624a532 [AWARE] Add discovery window period configuration 
Discovery window period configuration modifies the duty cycle of
the Aware discovery session. Allowing trade-offs of discovery
latency vs. power.

Add the configuration.

Note: the whole ConfigRequest object is not public (at this point)
so by default so is the new configuration.

Bug: 33552536
Test: unit tests and integration (sl4a) tests.
Change-Id: I16f5c084dbc91431763a81de0a3adfe6f452e44c
 2017-02-16 18:38:23 -08:00
Jerry Zhang
fba74d6c61 Merge changes from topic 'svcusb' am: 5e2a2ee39e am: 6f44072d03 
am: 35f8d6cfd0

Change-Id: I10c0be37b583f1670cb98e926aefb9dc8b986843
 2017-02-17 02:24:44 +00:00
Jerry Zhang
35f8d6cfd0 Merge changes from topic 'svcusb' am: 5e2a2ee39e 
am: 6f44072d03

Change-Id: Ic30bca41e088c2d077dc5aa09e373a02acb60be6
 2017-02-17 02:16:11 +00:00
Jerry Zhang
6f44072d03 Merge changes from topic 'svcusb' 
am: 5e2a2ee39e

Change-Id: I4b628b80e348e25377d0855301374e71cb8f2c64
 2017-02-17 02:11:45 +00:00