Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,885 Commits 3 Branches 0 Tags
e25ef515daaae62c9aa6ac411d7ee5a888990ce0
Commit Graph

240885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
e25ef515da Merge "Make QS tile lifecycle tests less flaky (hopefully)" into nyc-dev 
am: b2c8a4a

* commit 'b2c8a4a06a29472f65b9f5a46fcedf106f5a3487':
  Make QS tile lifecycle tests less flaky (hopefully)

Change-Id: I603df4f38c9cdcabc871733b58fb74c031e47b60
 2016-04-06 17:05:36 +00:00
Jason Monk
b2c8a4a06a Merge "Make QS tile lifecycle tests less flaky (hopefully)" into nyc-dev 2016-04-06 16:57:44 +00:00
Bill Yi
da71346d4b Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 4f997f2  -s ours

* commit '4f997f25925c5065fafc8e9d21519c33e81cd814':
  Import translations. DO NOT MERGE

Change-Id: Id7171355350e2d94d972dea6e23addf70f638a85
 2016-04-06 16:57:20 +00:00
Jason Monk
f30b5ca1b1 Make QS tile lifecycle tests less flaky (hopefully) 
Change-Id: I387c774267c076cf244d2870b051ad6d586d3564
 2016-04-06 12:54:26 -04:00
Bill Yi
4f997f2592 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-06 16:49:15 +00:00
Abodunrinwa Toki
4257b2df86 Merge "FloatingToolbar: Include scroll indicators in overflow." into nyc-dev 
am: 856ebe2

* commit '856ebe206b054c86419df9bab945fabd156bebd6':
  FloatingToolbar: Include scroll indicators in overflow.

Change-Id: I5ecf71df2d274a6fe624f171121452bd360a138b
 2016-04-06 16:43:44 +00:00
Chris Wren
a20d7bbcd1 Merge "don\'t pin ranking updates at the end of the queue." into nyc-dev 
am: ac17049

* commit 'ac17049fbd04400fb56ea364ac39ea2ae3a6e2be':
  don't pin ranking updates at the end of the queue.

Change-Id: Ie391b607055275670f42d6144bf85c0d8b88e833
 2016-04-06 16:43:42 +00:00
Abodunrinwa Toki
856ebe206b Merge "FloatingToolbar: Include scroll indicators in overflow." into nyc-dev 2016-04-06 16:38:51 +00:00
Chris Wren
ac17049fbd Merge "don't pin ranking updates at the end of the queue." into nyc-dev 2016-04-06 16:36:54 +00:00
Philip P. Moltmann
dfa9a55ad3 Merge "Prefix printer description with service-label instead of package-label." into nyc-dev 
am: 1a1f249

* commit '1a1f24980cb440752910fd4caddcd0bdc27f2c35':
  Prefix printer description with service-label instead of package-label.

Change-Id: I6cf8aedae541351661ecf56fe8e89b7f1f748e37
 2016-04-06 16:11:59 +00:00
Philip P. Moltmann
3b19fc83b1 Merge "Print Activity: Use a single (re-implemented) parsing logig for page ranges." into nyc-dev 
am: 6c2bed2

* commit '6c2bed24ec24c3f16971808cb3aacbd5daa9189a':
  Print Activity: Use a single (re-implemented) parsing logig for page ranges.

Change-Id: Id51c42985506cc02006b1eafd2dd77237e8f2f57
 2016-04-06 16:11:58 +00:00
Philip P. Moltmann
1a1f24980c Merge "Prefix printer description with service-label instead of package-label." into nyc-dev 2016-04-06 16:09:02 +00:00
Philip P. Moltmann
6c2bed24ec Merge "Print Activity: Use a single (re-implemented) parsing logig for page ranges." into nyc-dev 2016-04-06 16:08:49 +00:00
Raph Levien
7771760f03 Merge "Apply correct bottom padding to layouts" into nyc-dev 
am: 6cfecf4

* commit '6cfecf4dff3d55a98f933fdfd153339275005108':
  Apply correct bottom padding to layouts

Change-Id: I40e5272f1f22e5552a7d83a3e50e699f40102b75
 2016-04-06 15:58:16 +00:00
Raph Levien
6cfecf4dff Merge "Apply correct bottom padding to layouts" into nyc-dev 2016-04-06 15:52:56 +00:00
Julia Reynolds
7f713ab1c3 Merge "Documentation update for interruption filters." into nyc-dev 
am: fa305fc

* commit 'fa305fcc6ba8f4d95b0ee33bbe8c6d9e371096e1':
  Documentation update for interruption filters.

Change-Id: I980f35331785a31275a7d0bf251cfa1a6fcfc34a
 2016-04-06 15:41:13 +00:00
Julia Reynolds
fa305fcc6b Merge "Documentation update for interruption filters." into nyc-dev 2016-04-06 15:34:09 +00:00
David Brazdil
80a6d92384 Merge "Re-enable Optimizing apps dialog" into nyc-dev 
am: 4ac550f

* commit '4ac550f6813ff734d36757b8b9b2ee03c77b6273':
  Re-enable Optimizing apps dialog

Change-Id: I8d3621bd0c09ebe44c71662dbe9ca5aad301ce8d
 2016-04-06 15:24:40 +00:00
David Brazdil
4ac550f681 Merge "Re-enable Optimizing apps dialog" into nyc-dev 2016-04-06 15:21:23 +00:00
Chris Wren
52020492f2 don't pin ranking updates at the end of the queue. 
Apparently we schedule ranking updates all the time, so the job gets pulled
to the end of the queue, and can get starved. This change makes sure we
don't schedule multiple updates by leaving it in the queue. If a job in the
queue behind hte update request needs to send an update it will jsut
request one anyway, so we shouldn't miss updates.

Bug: 28015158
Change-Id: Id5b9d05ea6eb35e610ee34651e4cde8cddd4ae66
 2016-04-06 11:12:02 -04:00
Yohei Yukawa
f650e10a0c Merge "Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling." into nyc-dev 
am: 12a52bc

* commit '12a52bc3914ac593eb74f5787de54f3682d7f01d':
  Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling.

Change-Id: I3b807d48681946cbdccb6dc1c15fe5aa02502845
 2016-04-06 15:10:36 +00:00
Yohei Yukawa
12a52bc391 Merge "Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling." into nyc-dev 2016-04-06 15:06:57 +00:00
Ben Kwa
f85c321700 Merge "DocsUI: Update the drag shadow to meet UI spec." into nyc-dev 
am: 2084796

* commit '2084796e231104dac4c97903096b70b32534eee1':
  DocsUI: Update the drag shadow to meet UI spec.

Change-Id: I3ca872f356b7a6a246e8f391f8453980a0b76921
 2016-04-06 15:05:16 +00:00
Jeff Sharkey
32584cbbba Merge "Protect more broadcasts." into nyc-dev 
am: 32fa8d1

* commit '32fa8d13714928e9231762276c5851bd2d51d7b0':
  Protect more broadcasts.

Change-Id: I1b247630ecd11c807e843ed715af885e065f5124
 2016-04-06 15:05:14 +00:00
Ben Kwa
2084796e23 Merge "DocsUI: Update the drag shadow to meet UI spec." into nyc-dev 2016-04-06 15:02:04 +00:00
Jeff Sharkey
32fa8d1371 Merge "Protect more broadcasts." into nyc-dev 2016-04-06 14:59:41 +00:00
Julia Reynolds
47a351c932 Merge "Notify app op watchers when audio restrictions change." into nyc-dev 
am: 3397c88

* commit '3397c88f7900d8db677204cdbe9e7a5dc26e453a':
  Notify app op watchers when audio restrictions change.

Change-Id: I07d531153aeaf01080246980357c8a481ff88e93
 2016-04-06 14:34:04 +00:00
Andrei Stingaceanu
5c3ab1b8e7 Merge "Keyboard Shortcuts: protect against NPE in WindowManagerService" into nyc-dev 
am: 2616fbf

* commit '2616fbf6315e9d8bc1bad32faff7767c33ae0b78':
  Keyboard Shortcuts: protect against NPE in WindowManagerService

Change-Id: I8fac6f2f0bbc4540e4b02ec6610d8d82054974f5
 2016-04-06 14:34:03 +00:00
Julia Reynolds
dd0605b052 Documentation update for interruption filters. 
Bug: 27901142
Change-Id: I977f7dc4010dc826e06dfb01ad6db68380b80fde
 2016-04-06 10:33:14 -04:00
Julia Reynolds
3397c88f79 Merge "Notify app op watchers when audio restrictions change." into nyc-dev 2016-04-06 14:27:35 +00:00
Andrei Stingaceanu
2616fbf631 Merge "Keyboard Shortcuts: protect against NPE in WindowManagerService" into nyc-dev 2016-04-06 14:26:04 +00:00
David Brazdil
0fd0f893dd Re-enable Optimizing apps dialog 
Bug: 27350503
Change-Id: I98ae03571817792265780c9283b395c323638e14
 2016-04-06 15:11:02 +01:00
Andrei Stingaceanu
f671147434 Keyboard Shortcuts: protect against NPE in WindowManagerService 
Using an unresponsive app [while (true) { Thread.sleep(1000) }]
produces NPE:

WindowManager: Window Manager Crash
WindowManager: java.lang.NullPointerException: Attempt to read
               from field 'android.view.IWindow
               com.android.server.wm.WindowState.mClient' on a
               null object reference
WindowManager: at com.android.server.wm.WindowManagerService
               .requestAppKeyboardShortcuts
               (WindowManagerService.java:10628)

Which puts down SysUI (and requires restarting SysUI).

Protect against this by checking for nulls. The end result
is that the dialog is no longer shown for unresponsive apps
and SysUI does not break.

Bug: 27914463
Change-Id: I37f0b0d5980f6ddc50f3bb778582d23ee1c7e9c3
 2016-04-06 14:55:07 +01:00
Abodunrinwa Toki
8949faf066 FloatingToolbar: Include scroll indicators in overflow. 
Bug: 27427333
Change-Id: I7480cfe5f75d04e04792d9443435a76ab6773c64
 2016-04-06 14:22:42 +01:00
Rubin Xu
83d8678c29 Merge "Clear caller identity when calling createConfirmDeviceCredentialIntent" into nyc-dev 
am: 7f2bc45

* commit '7f2bc453309b28d096dd7c8c45d667516089fa79':
  Clear caller identity when calling createConfirmDeviceCredentialIntent

Change-Id: I6ae10f0d09ac61e4922e77e8978603cd23b0a8d9
 2016-04-06 13:19:24 +00:00
Rubin Xu
7f2bc45330 Merge "Clear caller identity when calling createConfirmDeviceCredentialIntent" into nyc-dev 2016-04-06 13:12:56 +00:00
Jaesung Chung
288d70f79b Merge "Fix build" into nyc-dev 
am: 5905bf7

* commit '5905bf738c175edfc63bf2e5ee28a43d83977e2d':
  Fix build

Change-Id: Icabf911c0eb4a96e88032312fd6fb6785b043932
 2016-04-06 12:55:34 +00:00
Jaesung Chung
5905bf738c Merge "Fix build" into nyc-dev 2016-04-06 12:50:32 +00:00
Jaesung Chung
fd3446e0aa Fix build 
Change-Id: I38aa2f70fef3cb5b4a6fe42a3e4aa8e0a16e6fe0
 2016-04-06 21:44:13 +09:00
Benjamin Franz
9c17111358 Merge "Document which APIs are callable on the parent instance" into nyc-dev 
am: 4a53c8e

* commit '4a53c8e70253928bf89913cb313de47450d0782f':
  Document which APIs are callable on the parent instance

Change-Id: I4cd3ca078d47bcb6c3f1d34f92224e5c8eb3e05f
 2016-04-06 12:23:01 +00:00
Benjamin Franz
4a53c8e702 Merge "Document which APIs are callable on the parent instance" into nyc-dev 2016-04-06 12:17:26 +00:00
Benjamin Franz
66b45f01ff Document which APIs are callable on the parent instance 
In DPM it is possible to retrieve a parent instance to set policies
that are applied to the profile parent. Extend the javadoc to clarify
which APIs are actually callable on the parent instance.

Bug: 27532279
Change-Id: I7ed40f8c3c7c3089283489bff41a04c70239d5a4
 2016-04-06 11:59:49 +01:00
Rubin Xu
0c9dd5b98a Clear caller identity when calling createConfirmDeviceCredentialIntent 
Bug: 27893870
Change-Id: I9edcd170432f8a2bd852a5fa78ab868201093dcf
 2016-04-06 11:54:59 +01:00
Bill Yi
417fa1357c Import translations. DO NOT MERGE 
Change-Id: I8bf415a99ffc8de3e174c431149736dea2a321b8
Auto-generated-cl: translation import
 2016-04-06 03:03:10 -07:00
Erik Kline
a577a3a29f Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev 
am: 3671285

* commit '36712853a9d0b57702ee5b1fd936ff0b9f48c151':
  Make public the registerDefaultNetworkCallback API

Change-Id: I35035f991a45ec700530a83cc9cc89145ebb0bb6
 2016-04-06 08:55:52 +00:00
Erik Kline
36712853a9 Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev 2016-04-06 08:51:08 +00:00
Jaewan Kim
e2a06f2f26 Merge "PIP: Apply the latest Recents row animation when PIP control is focused" into nyc-dev 
am: 4b12df6

* commit '4b12df6f7ec1684c4ae5218668ad26d0e8cf81d7':
  PIP: Apply the latest Recents row animation when PIP control is focused

Change-Id: Ib162a6a5764cfb9920dea8d8e0b3a1af7931df58
 2016-04-06 06:40:37 +00:00
Jaewan Kim
4b12df6f7e Merge "PIP: Apply the latest Recents row animation when PIP control is focused" into nyc-dev 2016-04-06 06:35:41 +00:00
Jaewan Kim
04cbe870ae PIP: Apply the latest Recents row animation when PIP control is focused 
Bug: 27540465
Change-Id: Ib3b40fb64953a175593eab789552db3c231f0227
 2016-04-06 15:20:58 +09:00
Jaewan Kim
2b58c2b41d Merge "PIP: Fix regressions caused by previous commit a0d4d25" into nyc-dev 
am: 841b49b

* commit '841b49bc3ffa28b1ea115486621b1c1a79c4e5c4':
  PIP: Fix regressions caused by previous commit a0d4d25

Change-Id: I9a3ab48b83e6cd25a784e4e60a3eac6f8c18f280
 2016-04-06 05:55:54 +00:00