Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
e606e999a7 Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev 2016-12-30 00:35:38 +00:00
Marie Janssen
6727859f42 resolve merge conflicts of 825d8ff to master 
Change-Id: I57ae47778f738dbea6a670b85f24161cfb544a16
 2016-12-29 16:20:43 -08:00
Marie Janssen
825d8ff56a resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp 
am: 07e590a574

Change-Id: I49fd2c3ed7ac5cbdf102ec289235b1fb12bee39a
 2016-12-29 23:45:39 +00:00
TreeHugger Robot
d3b9e3169d Merge "Don't allow permission change to runtime" 2016-12-29 23:08:23 +00:00
Jeremy Joslin
586d36e610 Fix NetworkScoreServiceTest.testSystemRunning. 
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33905890
Change-Id: Idc92fe3669b0efdb20d3899ce4ce7bae70033aff
 2016-12-29 15:00:23 -08:00
Eugene Susla
9d0a823788 Merge "Always propagate AccessibilityCache events" 2016-12-29 22:51:15 +00:00
Jean-Michel Trivi
9bc2a46288 Merge "New AudioAttributes usage for "assistant" use case" 2016-12-29 22:24:51 +00:00
Marie Janssen
07e590a574 resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp 
Change-Id: I42e00b90165220d88519771b8f4280aaf3a07525
 2016-12-29 14:05:47 -08:00
Svetoslav Ganov
ff8d66bbc2 Don't allow permission change to runtime 
Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.

Test: Added a CTS test which passes.

bug:33860747

Change-Id: Icd2d596d42ae2c6cf569c016d20d9bb9106a29ef
 2016-12-29 13:42:29 -08:00
Eugene Susla
eb1375c091 Always propagate AccessibilityCache events 
Bug: b/32642665
Test: Steps:
	- Retrieve root AccessibilityNodeInfo
	- Change text on its child TextView
	- Wait for a few seconds to let the AccessibilityEvent propagate to
    the AccessibilityCache
	- Get the child AccessibilityNodeInfo from the root, corresponding to
    that TextView, and ensure that it's updated to reflect the text
    change
Change-Id: Icbdb91803b646fa06aaf11996d350f6f65c1e809
 2016-12-29 13:05:58 -08:00
Sundeep Ghuman
6c92962153 Create ScoredNetwork Badging API changes. 
Defines an attribute bundles key to hold the badging curve, the
enums for badge values, and an API to retrieve a badge for a
specific RSSI.

Bug: 33457699
Test: Unit tests
Change-Id: If9e8a60c4670b51c395fb501f55ddece8a72981e
 2016-12-29 12:47:45 -08:00
Marie Janssen
c816141bce resolve merge conflicts of 9cc7ebe to stage-aosp-master 
Change-Id: Ia1cdf49d77a574c38ed5cc33c31d5cf930103484
 2016-12-29 12:44:03 -08:00
TreeHugger Robot
96b97d722f Merge "Disallow entering PiP without dismissing keyguard." 2016-12-29 20:29:45 +00:00
Ivan Podogov
afa10b8097 Merge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d am: e11c3f6657 
am: c7fad3b056

Change-Id: Id6695de96ad887fa979b5ffa89d42b44890cd96e
 2016-12-29 20:10:00 +00:00
Jean-Michel Trivi
0c8855d0f2 New AudioAttributes usage for "assistant" use case 
Define USAGE_ASSISTANT for new use cases involving audio help,
  query responses and more.

Test: make offline-sdk-docs
Bug: 30947943

Change-Id: Idf93ce4c0f014dbc9b491244cbad9e643cc03413
 2016-12-29 12:09:15 -08:00
Ivan Podogov
48e6745a08 Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499 am: 91ab2e2f98 
am: 48738f5ad0

Change-Id: I15651c5a6e3baf53d915626ea6c55180fefe28b5
 2016-12-29 20:08:38 +00:00
Hemant Gupta
c519b8d83e Bluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9 am: 1ee22b7f70 
am: a9c92c2442

Change-Id: I56625e00b1b6c2b7b11e4ce4dc3038072ef6c231
 2016-12-29 20:07:51 +00:00
Ivan Podogov
c7fad3b056 Merge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d 
am: e11c3f6657

Change-Id: Ie63297ebe01de04c6e40c2ddae616c8d5c70a025
 2016-12-29 20:00:52 +00:00
Ivan Podogov
48738f5ad0 Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499 
am: 91ab2e2f98

Change-Id: If0e072e96491020191a7742928cc90adff151342
 2016-12-29 20:00:09 +00:00
Hemant Gupta
a9c92c2442 Bluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9 
am: 1ee22b7f70

Change-Id: Ia82f834d4d2ad800574bb0317f4fb3b3786972fc
 2016-12-29 19:59:28 +00:00
Shahriyar Amini
9d621c4977 Merge "Make methods for Tile content provider data public." 2016-12-29 19:56:29 +00:00
Ivan Podogov
e11c3f6657 Merge changes from topic 'HID-Client' am: 8a74d0440c 
am: 59d63e8b1d

Change-Id: I73dc7aa098c0a4cb4c58371088c2aa0661ecdc41
 2016-12-29 19:47:47 +00:00
Ivan Podogov
91ab2e2f98 Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 
am: 94e3d3f499

Change-Id: I97ff93fd2564bd76d90095f8086f79c6c6086aff
 2016-12-29 19:46:55 +00:00
Hemant Gupta
1ee22b7f70 Bluetooth: Add support for HID Device Role am: e88fd4b594 
am: ee469c6fe9

Change-Id: Ic48911d254671d402f5a6b8198109f28e6497036
 2016-12-29 19:46:08 +00:00
Ivan Podogov
59d63e8b1d Merge changes from topic 'HID-Client' 
am: 8a74d0440c

Change-Id: I6a541011024253f7b7f5f5207294cf1bce60a4f0
 2016-12-29 19:39:07 +00:00
Ivan Podogov
94e3d3f499 Rename the Bluetooth profile classes for HID Device role. 
am: 0afe190af5

Change-Id: Ib5c9b904da57048d719df504142edd3dab0e6ec3
 2016-12-29 19:38:41 +00:00
Hemant Gupta
ee469c6fe9 Bluetooth: Add support for HID Device Role 
am: e88fd4b594

Change-Id: Ic2a82d5670ffbd3046766d73ed9b180546c59169
 2016-12-29 19:37:58 +00:00
Marie Janssen
9cc7ebe7d9 Merge "Bluetooth: track enabling in dumpsys" 2016-12-29 19:32:36 +00:00
Treehugger Robot
8a74d0440c Merge changes from topic 'HID-Client' 
* changes:
  Rename the Bluetooth profile classes for HID Device role.
  Bluetooth: Add support for HID Device Role
 2016-12-29 19:29:17 +00:00
Marie Janssen
5980456040 Bluetooth: track enabling in dumpsys 
Move basic state dumpsys to here from AdapterService.

Track which apps are enabling and disabling Bluetooth, including BLE
apps, and show the apps in the dumpsys logs.

Test: start phone and enable/disable, take bug report
Bug: 33692282
Change-Id: I6ea62ebdcfd7873d0be1bb5c5c520bbce3737a40
 2016-12-29 19:22:14 +00:00
Winson Chung
0655da0374 Disallow entering PiP without dismissing keyguard. 
- If an activity is showing on the keyguard and enters picture-
  in-picture, then prompt the user to authenticate first
- Fixing NPE in SystemUI due to null runnable being added to the
  post-keyguard-gone callbacks
- Prevent FLAG_SHOW_WHEN_LOCKED from applying when determining
  visibility over keyguard for activities that are in the pinned
  stack

Bug: 33660880
Test: android.server.cts.KeyguardLockedTests
Test: #testEnterPipOverKeyguard

Change-Id: I89477a8a0067e285e5d0122e918fac45274c57ad
 2016-12-29 10:53:23 -08:00
Jeremy Joslin
d687693902 Use the new BIND_NETWORK_RECOMMENDATION_SERVICE. 
Declare that the system uses the new
BIND_NETWORK_RECOMMENDATION_SERVICE permission.

Test: Built & ran
BUG: 33897544
Change-Id: I41c7550adf0d1f81ed9a12068ba569e6a57f3b42
 2016-12-29 10:37:57 -08:00
Svetoslav Ganov
17f739d924 Merge "Revert "Don't allow permission change to runtime"" 2016-12-29 18:26:07 +00:00
Svetoslav Ganov
5b95d07725 Revert "Don't allow permission change to runtime" 
This reverts commit 0f929c5320.

Change-Id: I1b86461e352a6a2cf3d32748e06c7d5806937667
 2016-12-29 18:25:27 +00:00
Geoffrey Pitsch
f47277805a Merge "Change Notification Inline Settings for Channels" 2016-12-29 15:36:56 +00:00
Martijn Coenen
37455587e9 Remove obsolete calls to IPCThreadState/ProcessState. 
Threadpools are started automatically, if necessary.

Bug: 31226656
Test: mma
Change-Id: Ib3542ee6f1530ee9c08eb7e9608db741d2c1560d
 2016-12-29 14:54:18 +00:00
Ivan Podogov
0afe190af5 Rename the Bluetooth profile classes for HID Device role. 
We already have BluetoothInputDevice class, so adding something
called BluetoothHidDevice seems confusing. On the other hand,
the new class is designed to connect to HID Host devices, so
naming it BluetoothInputHost makes sense and goes in line with
the existing BluetoothInputDevice.

The same goes for the new constant HID_DEVICE that is just as
confusing to have together with the INPUT_DEVICE one.

This CL also renames the "connection state changed" broadcast
(for the same reasons), declares it as an SDK constant, and also
adds some javadoc to it.

Note that BluetoothHidDeviceApp* classes remained unchanged, as
those correspond to the app that implements the Device (and
connects to the Host).

Test: make
Change-Id: I5075ca5b97db3c1dd403c2e9660eecc7380cffe2
 2016-12-29 14:30:40 +00:00
Hemant Gupta
e88fd4b594 Bluetooth: Add support for HID Device Role 
This patch adds the HID Device Role support in Bluetooth framework.
Also AIDL and callback related files for HID Device role are added
to provide interface for third party applications to communicate with
HID Device Service.

Change-Id: Id03a362b7bcfa2e76056fa0197eaac12ce49b5a2
 2016-12-29 14:29:53 +00:00
Tony Mak
bf9928de18 Make sure ServiceConnection callback is called in main thread 
Fix: 33568999

Test: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases
--test com.android.cts.devicepolicy.DeviceOwnerPlusManagedProfileTest

Change-Id: I14c8b5b1f78192429e68a3057430406245a909c8
 2016-12-29 14:07:46 +00:00
Charles He
5394fd0450 Remove duplicate lines due to automerger 
Test: make
Bug: 30352311
Change-Id: Ic476be8fca733414589202701fe91e5eb47e97fb
 2016-12-29 12:53:58 +00:00
Selim Cinek
3e555495fc Merge "Improved the behavior with the empty shade view" 2016-12-29 12:26:44 +00:00
Selim Cinek
fe0f4357a1 Merge "Fixed a bug where notifications could stay expanded" 2016-12-29 12:26:07 +00:00
Charles He
c5f81651a1 Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 2c29250b44" into nyc-mr2-dev-plus-aosp 
am: b5a5a51623

Change-Id: I6ceee43b87307b384cc3b6632b23d3859afa770a
 2016-12-29 11:58:01 +00:00
Charles He
c905c2e588 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 2c29250b44 
am: 7aa7ee7338

Change-Id: I9e54ff0a37fc111c993d9db073f3fe7fbf0f5488
 2016-12-29 11:57:50 +00:00
Charles He
051803f04a Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 171fa83224" into nyc-mr2-dev-plus-aosp 
am: 140ac4efb5

Change-Id: I25deb2a809f93e6c556f5219facc957254dd1488
 2016-12-29 11:56:00 +00:00
Charles He
11cbd13474 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 171fa83224 
am: cc2c82436e

Change-Id: I9c3ea23206e3d42fe32f3b5091093b51431d4611
 2016-12-29 11:55:48 +00:00
Charles He
d2d439e19b Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: 0881d980ad" into nyc-mr2-dev-plus-aosp 
am: 2518cfcc59

Change-Id: Ic1496b88e823f14497f21bf86ff16543cb201440
 2016-12-29 11:53:47 +00:00
Charles He
b5c1a16e31 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: 0881d980ad 
am: ac437a2961

Change-Id: I5136cccc00c7c38781da51eee549c74be01efef3
 2016-12-29 11:53:36 +00:00
Charles He
2125ea1a00 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: fdcec75c74" into nyc-mr2-dev-plus-aosp 
am: bf9a3b4b0d

Change-Id: I0dd2ac558534b27371690c7b5f703ec27effeb93
 2016-12-29 11:51:43 +00:00
Charles He
a54f83c99c Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: fdcec75c74 
am: f2263e3a5e

Change-Id: I7dc971d31d61d49bbe2c2031ef336176cc9b3eae
 2016-12-29 11:51:30 +00:00