Commit Graph

72449 Commits

Author SHA1 Message Date
Makoto Onuki
2e83edb4b0 Merge "Revert "ShortcutManager: Floating shortcuts shouldn't have target activities."" 2017-01-06 21:32:35 +00:00
Sergei Vasilinetc
ab08c65533 Merge changes I68d56d76,Iad432577
* changes:
  Hidden method to get a graphic buffer from a hardware bitmap
  Move GraphicBuffer to graphics package
2017-01-06 20:36:41 +00:00
TreeHugger Robot
a8d123de10 Merge "Support for WindowContainer controllers and listeners" 2017-01-06 20:07:31 +00:00
TreeHugger Robot
deafcf02c2 Merge changes If135544e,Ic595b01f
* changes:
  bools: fix use_lock_pattern_drawable javadoc.
  widget: Adding support for custom LockPatternView.
2017-01-06 20:06:02 +00:00
Ruchi Kandoi
bc1d78606c Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f am: c1db6c05d0
am: bbc00c877f

Change-Id: I1a84b4ce4215136f30ce7936581ee80230c8abbc
2017-01-06 19:19:51 +00:00
Makoto Onuki
9fd9019cf1 Revert "ShortcutManager: Floating shortcuts shouldn't have target activities."
This reverts commit 106ff7a0a1.

Test: All the unit tests (ShortcutManagerTest1*) CtsShortcutHostTestCases and CtsShortcutManagerTestCases

Change-Id: Iadce2b3785cbf728daa60c4e2ff103e516d85896
2017-01-06 11:17:08 -08:00
Ruchi Kandoi
bbc00c877f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f
am: c1db6c05d0

Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d
2017-01-06 19:10:22 +00:00
Ruchi Kandoi
c1db6c05d0 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b
am: 388980d88f

Change-Id: I8d5498492cae8ffe9048422720427855eaad5ca8
2017-01-06 19:03:07 +00:00
Ruchi Kandoi
388980d88f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
am: cc4203221b

Change-Id: I4add3ce1cf3170aff887865302964b4425094692
2017-01-06 18:58:17 +00:00
Ruchi Kandoi
104e0b4399 nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
Bug: 32881476
Test: Manual; backup, change settings, restore

Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-06 18:48:51 +00:00
Alain Vongsouvanh
88a2a61f09 widget: Adding support for custom LockPatternView.
OEMs can overlay the default 9 dots by providing two drawables that represent
those dots:
  * lockscreen_notselected: asset to display when a cell has not been selected.
  * lockscreen_selected: asset to display when a cell has been selected.

BUG: 33755663
Change-Id: Ic595b01f5e1321696b7a3feb0ff73c1acccfb942
2017-01-06 10:22:45 -08:00
TreeHugger Robot
424bce6ec6 Merge "Use internal volume controller and status bar." 2017-01-06 17:39:08 +00:00
Wale Ogunwale
26c0dfed7a Support for WindowContainer controllers and listeners
- WindowContainerController class allows a component outside window manager
to create a window container and communicate directly with it to make
changes. For example, the ActivityRecord class in activity manager uses the
AppWindowContainerController class to create and communicate with
AppWindowToken window container class which is its counterpart on the window
manager side.
- WindowContainerListener interface allows a component outside WM to get
notified of changes to a window container. For example, the ActivityRecord
class in AM implements the AppWindowContainerListener interface to get
notified of changes to the AppWindowToken container.

Bug: 30060889
Test: Existing tests pass and manual testing.
Test: bit FrameworksServicesTests:com.android.server.wm.WindowContainerControllerTests
Test: bit FrameworksServicesTests:com.android.server.wm.WindowContainerTests
Change-Id: I2896bfa46a80b227052528c7da8cf4e56beab4bc
2017-01-06 09:11:02 -08:00
Julia Reynolds
bb983d20d2 Use internal volume controller and status bar.
Remove code that let these components be replaced by external
processes.

Bug: 33006669
Bug: 34106436
Test: manual. reboot device, play music, change volume,
view notifications
Change-Id: I458f11537ab9db6f23735487513815553004613f
2017-01-06 15:59:45 +00:00
Julia Reynolds
f35e3976e3 Allow apps to enable notification badging.
Test: runtest systemui-notification
Change-Id: Ia16d671d864d1eee902652e31f023e30dc6b7387
2017-01-06 10:57:51 -05:00
TreeHugger Robot
414f8fbdbb Merge "resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2017-01-06 10:40:36 +00:00
Narayan Kamath
3aea733059 Merge "PackageManagerService: Implement packageParser cache in ParallelPackageParser." 2017-01-06 09:14:03 +00:00
Ajay Panicker
d02e1c3024 Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53 am: d76576b6d1 am: e0211af867
am: af525ff403

Change-Id: I564721fb1ba889cd159f10e769aee4a5bee3db67
2017-01-06 01:57:10 +00:00
Ajay Panicker
af525ff403 Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53 am: d76576b6d1
am: e0211af867

Change-Id: I5ac57ca6439359fc65622254090a3ea6cc2aec18
2017-01-06 01:50:03 +00:00
Ajay Panicker
e0211af867 Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53
am: d76576b6d1

Change-Id: I0b59b10a095bf23d4f26856690bf6be2a5304cbc
2017-01-06 01:46:10 +00:00
Ajay Panicker
d76576b6d1 Merge "Prevent LocalSocket from creating an fd if fd is already there"
am: 616910fd53

Change-Id: I90192dd7e656b9bec62815ad628fc4e67f806240
2017-01-06 01:41:09 +00:00
Julia Reynolds
d791bbcf81 Merge "Wait 100 ms for assistant response before posting." 2017-01-06 01:30:47 +00:00
Treehugger Robot
616910fd53 Merge "Prevent LocalSocket from creating an fd if fd is already there" 2017-01-06 01:29:47 +00:00
Steven Moreland
4d3caf3938 Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca am: 3290ba072b
am: 94924f38fb

Change-Id: I3b871a941856fdeb0e989aeaadc5fdbc7732b681
2017-01-06 01:16:02 +00:00
Steven Moreland
94924f38fb Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca
am: 3290ba072b

Change-Id: I49ee88cca2b2da0eac8d73cf408d2c5bfb409ce9
2017-01-06 01:09:26 +00:00
Steven Moreland
3290ba072b Merge "HwBinder: get/register checked exceptions."
am: 9ec4fec5ca

Change-Id: Id6abc10992428af2e55cb5228c298b69c111c621
2017-01-06 01:05:02 +00:00
Treehugger Robot
9ec4fec5ca Merge "HwBinder: get/register checked exceptions." 2017-01-06 00:58:17 +00:00
TreeHugger Robot
9b89e5b02c Merge "resolve merge conflicts of cb29c97907 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp 2017-01-06 00:42:35 +00:00
Amin Shaikh
cf9ad83520 Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4 am: 7495cf633c am: d7f371813a
am: ea7931d107

Change-Id: I193abae0fef7cb976ef970085363822f4770215c
2017-01-06 00:29:31 +00:00
Amin Shaikh
ea7931d107 Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4 am: 7495cf633c
am: d7f371813a

Change-Id: I8fc3a45a910294c46982bac9a3f6e183977aad16
2017-01-06 00:21:56 +00:00
Amin Shaikh
d7f371813a Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4
am: 7495cf633c

Change-Id: Ie6913526fbc1b0ae63eb7c0c7be7d9eac5772f50
2017-01-06 00:15:01 +00:00
Alain Vongsouvanh
c89202e177 resolve merge conflicts of cb29c97907 to nyc-mr2-dev-plus-aosp
Change-Id: I22ff2e61c0d46310e62fa45f98e11a5bba3d5f1a
2017-01-05 16:11:25 -08:00
Amin Shaikh
7495cf633c Merge "Fix NetworkScorerAppManager#isCallerActiveScorer."
am: 48eecdcbc4

Change-Id: I6b9ecd35dbc0758cd45b804dc9586287428af293
2017-01-06 00:08:19 +00:00
Treehugger Robot
48eecdcbc4 Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." 2017-01-05 23:57:54 +00:00
Ajay Panicker
7a8c36aa4e Prevent LocalSocket from creating an fd if fd is already there
Any LocalSocket created with a FileDescriptor will throw IOExceptions
when performing most opperations due to the fact that the LocalSocket
tries to create an implementation but fails since there is a FileDescriptor
already set.

Bug: 34095140
Test: Setup using tap&go
Change-Id: Ie8f50def6156c16617697d939d6c0ab570281642
2017-01-05 23:52:30 +00:00
Alain Vongsouvanh
5549258eea resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp
Change-Id: Ia35164bd4ea262fa72afb7b78a47b0e4f0ef96ba
2017-01-05 15:27:37 -08:00
TreeHugger Robot
54217e5c25 Merge "Added SystemServerInitThreadPool" 2017-01-05 22:37:44 +00:00
Amin Shaikh
2cd918a63e Fix NetworkScorerAppManager#isCallerActiveScorer.
The current implementation checks whether the caller's uid has the
SCORE_NETWORKS permission instead of checking the passed in callingUid. I
removed this check entirely because the getActiveScorer method already checks
whether the scorer's package has the SCORE_NETWORKS permission. There is no way
callingUid can equal the active scoring package's uid without also having the
SCORE_NETWORKS permission.

Bug: 34107721
Test: runtest --path core/tests/coretests/src/android/net/NetworkScorerAppManagerTest.java
Change-Id: Ifd427792169837c84a10a76b208c76137db06ae9
2017-01-05 14:28:47 -08:00
Fyodor Kupolov
e29a5a1152 Added SystemServerInitThreadPool
System services can use it during the boot to submit tasks that can be run in
parallel with the main thread.

Switched PersistentDataBlockService and FingerprintService from FgThread to
the new thread pool.

UiModeManagerService: update initial configurations on init thread. They run
while holding the mLock so no extra synchronization barriers are needed at a
later stage.

Test: manual - device boots without errors
Test: ParallelPackageParserTest passes
Change-Id: I548f34b0a18f61924e09a39afb12e085cde35442
2017-01-05 13:12:37 -08:00
Kang Li
f1941775b6 Merge "Fix crash when updating ranking model in ChooserActivity." 2017-01-05 21:11:56 +00:00
TreeHugger Robot
f7fd02d6e9 Merge "HwBinder: get/register checked exceptions." 2017-01-05 21:06:10 +00:00
Julia Reynolds
4b82f6ddb0 Wait 100 ms for assistant response before posting.
Test: make cts-verifier
Change-Id: Idf04c2d24f02a32634e2308da6d1599c9ea29bd4
2017-01-05 20:26:23 +00:00
TreeHugger Robot
192d719abb Merge "Add content description and tooltip to menu item" 2017-01-05 19:46:28 +00:00
Alain Vongsouvanh
cb29c97907 widget: Adding support for custom LockPatternView.
am: 2fda2ce159

Change-Id: Ib0d53bd7258f784dc3cb0661757b7c6d4979007f
2017-01-05 19:45:02 +00:00
Kang Li
0cef910d5e Fix crash when updating ranking model in ChooserActivity.
Bug: 34095835

Test: manual tests (automated tests will be added later): 1. take a
picture and share it to Photos; 2. take a bug report and share it to
Gmail; 3. launch Chrome app, share a webpage to Drive; and 4. launch Contacts
and share a contact to Messenger.

Change-Id: Ie50c8305f90b6df69aa1e47c01d0b2212da0a37a
2017-01-05 11:43:15 -08:00
Narayan Kamath
5c50e86301 PackageManagerService: Implement packageParser cache in ParallelPackageParser.
We save about 2800ms of cold startup time over baseline on a marlin,
and ~1200 ms over the parallel parsing case.

                   warm     cold
		   ---------------
Baseline         : 1700ms   4300ms
Parallel         : 1400ms   2700ms
Cache            : 1000ms   1600ms
Cache & parallel : 900ms    1500ms

Note that further changes will improve the speed of cache processing.

This change also includes support for :
- a flag that been flipped in code (currently set to false).
- disabling the cache via a system property.
- wiping the cache on system upgrades.
- cache versioning.

Bug: 30792387

Test: FrameworksServicesTests
Test: manual timing

Change-Id: I281710c110af5307901dd62ce93b515287c91918
2017-01-05 19:15:31 +00:00
John Reck
874d45597f Merge "Workaround for custom TypedArray injectors" 2017-01-05 19:00:00 +00:00
TreeHugger Robot
1dbb3f1135 Merge "Abstract ZygoteInit.maybePreload call for webview." 2017-01-05 18:07:49 +00:00
Vladislav Kaznacheev
7039cbc6f3 Add content description and tooltip to menu item
Bug: 34076597
Test: manual
Change-Id: Ide32463252457721286c929ab2f8f7bae241835d
2017-01-05 09:57:40 -08:00
Steven Moreland
20ca2f782b HwBinder: get/register checked exceptions.
Bug: 33673120
Test: hidl_test_java
Change-Id: Id19b61b252e756a032ae11f7b59bd8eed82edbe9
2017-01-05 09:22:03 -08:00