drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
279,312 Commits 1 Branch 0 Tags
Commit Graph

279312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andre Eisenbach
e81838f7e1 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e 
am: 2d0ad3a9e7

Change-Id: I9ba589e7b46bf48374b30975ccc9fedb6d740b01
 2017-01-12 16:44:42 +00:00
Andre Eisenbach
2d0ad3a9e7 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" 
am: 0b9a18d21e

Change-Id: I245966c53c49da6c0b95b73ec72754d85edcd627
 2017-01-12 16:27:03 +00:00
Andre Eisenbach
0b9a18d21e Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" 2017-01-12 15:58:37 +00:00
Andre Eisenbach
8b4838e5e3 Revert "Don't offer the BT sharing option to the user if BT is disallowed." 
Causes boot loop issue:

02-15 02:31:59.785   770   770 E System  : Caused by: java.lang.IllegalArgumentException: Unknown component: com.android.bluetooth/com.android.bluetooth.opp.BluetoothOppLauncherActivity
02-15 02:31:59.785   770   770 E System  : .at com.android.server.pm.PackageManagerService.setEnabledSetting(PackageManagerService.java:18500)
02-15 02:31:59.785   770   770 E System  : .at com.android.server.pm.PackageManagerService.setComponentEnabledSetting(PackageManagerService.java:18461)
02-15 02:31:59.785   770   770 E System  : .at android.app.ApplicationPackageManager.setComponentEnabledSetting(ApplicationPackageManager.java:2129)
02-15 02:31:59.785   770   770 E System  : .at com.android.server.BluetoothManagerService.updateOppLauncherComponentState(BluetoothManagerService.java:2036)



This reverts commit 77fe44ffb6b5d40daf3b127cb36d5111b7618cc1.

Change-Id: Ia079bb2fcc91bb5979a3840ab50b9d9ddda1cf24
 2017-01-12 15:57:29 +00:00
Mark Salyzyn
6dacea63d9 Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b 
am: d1740f0f5b

Change-Id: I78430cd21cf1186ccc2b48ee4ee8a9b07decde5e
 2017-01-12 15:46:20 +00:00
Mark Salyzyn
d1740f0f5b Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" 
am: 2225a0640b

Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966
 2017-01-12 15:32:50 +00:00
Mark Salyzyn
2225a0640b Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" 2017-01-12 15:18:26 +00:00
Przemyslaw Szczepaniak
95322ffdde Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a 
am: 3556fd53a2

Change-Id: Idd321bad02683a94425fb2b6302f3f7621b6844f
 2017-01-12 11:33:15 +00:00
Przemyslaw Szczepaniak
3556fd53a2 Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" 
am: c0d71fa38a

Change-Id: I43d1e2241bfcb1dde53390e21c94c44054375901
 2017-01-12 11:27:32 +00:00
Treehugger Robot
c0d71fa38a Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" 2017-01-12 11:20:06 +00:00
Erik Kline
082263344a Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b 
am: cbd3d8b356

Change-Id: I845443ae243429847e0a42b3be5bec6276a216c0
 2017-01-12 10:33:24 +00:00
Martijn Coenen
eed50c1809 Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb 
am: aa4d6f1be9

Change-Id: I5153b688467f4d06da701eaa34bfa19c7904e33d
 2017-01-12 10:31:35 +00:00
Erik Kline
cbd3d8b356 Merge "Simplify UpstreamNetworkMonitor callback handling" 
am: f9f5cf9d9b

Change-Id: I642567d81b6b8908b2ef7afea8d15628330481f9
 2017-01-12 10:26:43 +00:00
Martijn Coenen
aa4d6f1be9 Merge "Use new read(Embedded)Buffer APIs." 
am: 34ed84d4eb

Change-Id: Idaa3a3a2d874b10cb5f07e3cb606c822e7ddfd8b
 2017-01-12 10:25:01 +00:00
Treehugger Robot
f9f5cf9d9b Merge "Simplify UpstreamNetworkMonitor callback handling" 2017-01-12 10:18:24 +00:00
Treehugger Robot
34ed84d4eb Merge "Use new read(Embedded)Buffer APIs." 2017-01-12 10:17:40 +00:00
Przemyslaw Szczepaniak
fb864ff0f9 Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d 
java.util.regex named group capture support.

Test: vogar OldMatcherTest
Bug: 19717812
Change-Id: I525489bc26083b22bb2ce670d614f6d6e6eeaa29
 2017-01-12 09:40:47 +00:00
Stephen Chen
272e70bf69 Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366 
am: 0e7882f2ac

Change-Id: I7408b253a7acc4aaf22dc7748b1941576d5de4c7
 2017-01-12 07:27:22 +00:00
Stephen Chen
0e7882f2ac Merge "Expose WifiManager#connect and ActionListener as @SystemApi" 
am: 691ebe5366

Change-Id: I114cbc6777130b440639b2f13e161d8d044f7185
 2017-01-12 07:21:49 +00:00
Treehugger Robot
691ebe5366 Merge "Expose WifiManager#connect and ActionListener as @SystemApi" 2017-01-12 07:15:06 +00:00
Stephen Chen
58ddbd76bb Expose WifiManager#connect and ActionListener as @SystemApi 
This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.

Bug: 33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8
 2017-01-11 21:51:36 -08:00
Colin Cross
dcb0c55c15 Merge "Remove libservicestestsjni" am: d00478e9ad 
am: 301c714b43

Change-Id: I08e2298e7dd1ba8729e6d4a03e3c940012bb5e12
 2017-01-12 05:05:41 +00:00
Colin Cross
301c714b43 Merge "Remove libservicestestsjni" 
am: d00478e9ad

Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c
 2017-01-12 04:59:42 +00:00
Treehugger Robot
d00478e9ad Merge "Remove libservicestestsjni" 2017-01-12 04:50:57 +00:00
Erik Kline
452b4b7218 Simplify UpstreamNetworkMonitor callback handling 
In the callback post a lamba to the target state machine's handler
that does the processing we need before sending a notification to
the state machine.

No semantic change, just a bit cleaner.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - tested basic wifi-to-mobile tethering (no DUN)
Bug: 32163131
Change-Id: I07e1b510c1ebaa5dffd42a3f16ba96e961cb58f1
 2017-01-12 13:43:00 +09:00
Colin Cross
3bc99892e6 Remove libservicestestsjni 
frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.

Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
(cherry-picked from e399468b88ae84a586f9d583251ee0a6a7e94a43)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065
 2017-01-12 03:24:57 +00:00
Shijian Li
699e7878ef Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. 
am: 5e7fc7ccc8

Change-Id: I327673625deafc5c18319ce1b61734a090b6a989
 2017-01-12 03:07:23 +00:00
Yifan Hong
860ef8810d Merge "BpBase -> BpHwBase" am: d8384b5c15 
am: e0707f139d

Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e
 2017-01-12 02:08:36 +00:00
Yifan Hong
e0707f139d Merge "BpBase -> BpHwBase" 
am: d8384b5c15

Change-Id: I647e8ec4461e4d9c859144c123f278216111a2f4
 2017-01-12 01:58:33 +00:00
Treehugger Robot
d8384b5c15 Merge "BpBase -> BpHwBase" 2017-01-12 01:50:58 +00:00
Mark Salyzyn
96bf5985d5 Replace cutils/log.h and log/logger.h with android/log.h or log/log.h 
(part deux)

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I7417936c4d3666608fccfe51a312c90ecefba2fb
 2017-01-11 15:30:30 -08:00
Etan Cohen
b32dfa4ef5 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 
am: 2a4e3bef2c

Change-Id: I6f894d92451032657678639c3021eef07289a6a2
 2017-01-11 23:17:19 +00:00
Etan Cohen
2a4e3bef2c Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" 
am: dfe8f5dc13

Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42
 2017-01-11 23:12:16 +00:00
Etan Cohen
dfe8f5dc13 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" 2017-01-11 22:59:25 +00:00
Jeremy Joslin
ab9eb11e2f Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 
am: 425a0fdc95

Change-Id: Icd1e76d7987cc9937cce5079dedf610fcd21c903
 2017-01-11 19:59:27 +00:00
Jeremy Joslin
425a0fdc95 Merge "Move getActiveScorerPackage() to the score service." 
am: b5488ec3b3

Change-Id: I8819c482a87a8c78ad0a1a39dda74b5ee2e7da4c
 2017-01-11 19:52:37 +00:00
Treehugger Robot
b5488ec3b3 Merge "Move getActiveScorerPackage() to the score service." 2017-01-11 19:40:45 +00:00
Etan Cohen
6a4b323f08 [AWARE] Unhide Wi-Fi Aware API (baseline) 
Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).

Bug: 30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933
 2017-01-11 11:13:26 -08:00
Shijian Li
5e7fc7ccc8 Sync the startConsentUiIfNeeded logics to master. We are missing the package 
name when starting the activity now.

Bug: 34216066
Change-Id: Ic8c8576ce2c65bc554bbf4794e169838c2ccbbe1
 2017-01-11 18:07:46 +00:00
Akira Oshimi
d999e53487 Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 
am: 49b68ad0cd

Change-Id: I02de0a87c633f4ffc8cee81e8773e31c9851d19d
 2017-01-11 16:06:22 +00:00
Akira Oshimi
49b68ad0cd Merge "Fix clipping for edit screen of Quick Settings" 
am: e3677865a8

Change-Id: Idb615698c433bd4436950cbf94ced95f02198cd9
 2017-01-11 16:01:23 +00:00
Treehugger Robot
e3677865a8 Merge "Fix clipping for edit screen of Quick Settings" 2017-01-11 15:51:37 +00:00
Mark Salyzyn
ef8ccc8510 Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 
am: 6143cbf1e5

Change-Id: Id192d8dd973fe9e70acab72bae9856bc8a62ac75
 2017-01-11 15:40:24 +00:00
Mark Salyzyn
6143cbf1e5 Merge "Replace cutils/log.h and log/logger.h with log/log.h" 
am: e7fcbcb991

Change-Id: I13ddcd1826ce3df02a6c95875b9fa981c238ca08
 2017-01-11 15:35:19 +00:00
Mark Salyzyn
e7fcbcb991 Merge "Replace cutils/log.h and log/logger.h with log/log.h" 2017-01-11 15:24:11 +00:00
Neil Fuller
d544a4c682 Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6 
am: 5be9960f66

Change-Id: I7cc9fed8ca298bd559b94ff57fd881b0651a16bd
 2017-01-11 15:02:42 +00:00
Lenka Trochtova
44a53bab46 Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97 
am: 345362c66f

Change-Id: I56d94f43683581d940d3711c9ca86fee0861b0e6
 2017-01-11 14:59:18 +00:00
Neil Fuller
5be9960f66 Merge "Switch ConfigUpdater to the new version of timezone updater code" 
am: 216303cdb6

Change-Id: I106699e4f141b27e0ace17d4997a2a67bf6a7c55
 2017-01-11 14:54:51 +00:00
Lenka Trochtova
345362c66f Merge "Don't offer the BT sharing option to the user if BT is disallowed." 
am: 0c1a4b6a97

Change-Id: Ic304d77ea532a1a6a6539ba9d4dca35a0f628ff2
 2017-01-11 14:49:09 +00:00
Neil Fuller
216303cdb6 Merge "Switch ConfigUpdater to the new version of timezone updater code" 2017-01-11 14:46:47 +00:00