Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,267 Commits 3 Branches 0 Tags
a3e767a73db5e09d6d178aeb058cebf62fa89142
Commit Graph

245267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Chang
a3e767a73d Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev 
am: 7c527bf76d

* commit '7c527bf76dcdcda414f10ed829999310f46161e7':
  Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: If3e915aa66d29f70c217b3231937730c63f7e9eb
 2016-05-23 18:49:16 +00:00
Victor Chang
7c527bf76d Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev 2016-05-23 18:42:09 +00:00
Philip P. Moltmann
7ca655ea0a Merge "Correct height of add printer list separator" into nyc-dev 
am: 80c18bcc3a

* commit '80c18bcc3a52dee62eec4b95de1ebfbf3c7d397f':
  Correct height of add printer list separator

Change-Id: I3cfdf14bc4e72b727f6469f99f950794e667ce33
 2016-05-23 18:38:36 +00:00
Winson
60c32b1f15 Removing extra haptic feedback. 
am: 7660bca509

* commit '7660bca5099b1a568e025345f1ba0aa68793e15a':
  Removing extra haptic feedback.

Change-Id: I91237da897bfeeb89405e4e44828e1c312eee951
 2016-05-23 18:30:34 +00:00
Philip P. Moltmann
80c18bcc3a Merge "Correct height of add printer list separator" into nyc-dev 2016-05-23 18:27:14 +00:00
Winson
7660bca509 Removing extra haptic feedback. 
- ag/923796 changed the logic to always return true, so these extra 
  calls are no longer needed.

Bug: 28867314
Change-Id: I07a4f6ac772a1444bba1950b2f27aa4be58a8419
 2016-05-23 18:24:49 +00:00
Wale Ogunwale
342065cc95 Merge "Fixed flicker when docking task from recents." into nyc-dev 
am: bc0a5cb2f8

* commit 'bc0a5cb2f8b5cac550196b535d91e07bb586f647':
  Fixed flicker when docking task from recents.

Change-Id: I706798a9561613033af637473bf98b8fb72a8ca4
 2016-05-23 18:12:38 +00:00
Suprabh Shukla
1c49c33f3e Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev 
am: 653e7bedb4

* commit '653e7bedb4ea95f69c109d54ddd0b7a49e6530c6':
  Fixing isOpRestricted in AppOpsService

Change-Id: Ic73cd0e420b5ed3efec3e8f34df1e350cf227944
 2016-05-23 18:03:32 +00:00
TreeHugger Robot
bc0a5cb2f8 Merge "Fixed flicker when docking task from recents." into nyc-dev 2016-05-23 18:01:13 +00:00
TreeHugger Robot
653e7bedb4 Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev 2016-05-23 17:57:50 +00:00
Chris Wren
66bd6bca16 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 
am: 0a9ccf2619

* commit '0a9ccf26192bc5a6fd74afb7afd4834b08230299':
  Never fetch notification badges for USER_SYSTEM

Change-Id: Ic6530a6b92c26d68a25ab15d24779b5f3f10f35a
 2016-05-23 17:47:29 +00:00
Chris Wren
0a9ccf2619 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 2016-05-23 17:44:16 +00:00
Tony Mak
23642330a7 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev 
am: 5ee420c0d5

* commit '5ee420c0d562e9ff55fe9bf03c746bc76fd40d5e':
  Remove PROPERTY_WORK_CALL

Change-Id: I17d204d01b2fc356fa6b70d4c5cd73f4b0a10d6c
 2016-05-23 17:26:45 +00:00
Winson
7fea69c3b6 Catching all exceptions when docking. 
am: f60a4af047

* commit 'f60a4af04779174b39b7d3d277de88ed1204d024':
  Catching all exceptions when docking.

Change-Id: I7ed98c617e3cdc241546d085ede23f49445cd223
 2016-05-23 17:26:43 +00:00
Tony Mak
5ee420c0d5 Merge "Remove PROPERTY_WORK_CALL" into nyc-dev 2016-05-23 17:17:27 +00:00
Winson
f60a4af047 Catching all exceptions when docking. 
- Catch all exceptions thrown when docking an activity (similar to when
  we start an activity) to allow us to gracefully handle the failure and
  animate the task back into the stack.

Bug: 28867188
Change-Id: I3f80d261343c0161c5cbfd08a05a1fc6157f653e
 2016-05-23 17:12:33 +00:00
Philip P. Moltmann
8aa4856f22 Correct height of add printer list separator 
Do not use listPreferredItemHeightSmall a height for list separator.

Fixes: 28907033
Change-Id: Ibe9744f28e7bd17fb5a298fa3cff0e3d403de10f
 2016-05-23 09:54:39 -07:00
Victor Chang
12753ded44 Fix Certificate authority installed notification is gone when turning off and on the work mode. 
cause: Work mode is turned on before entering USER_STOPPED state.
Thus, BOOT_COMPLETED broadcast is not sent, but the notification has been dismissed.

use USER_STARTED + USER_UNLOCKED because both are foreground.

Bug: 28864104
Change-Id: I4796b61586e194d8367b9e52a9c56f858cbcbe7d
 2016-05-23 17:41:01 +01:00
Wale Ogunwale
8c09c7dd7a Fixed flicker when docking task from recents. 
Regression introduced by ag/1044640 where we don't want recents to the
visible if it's stack isn't fullscreen or focused. However, it is
possible for switching the home stack to not-fullscreen to prolonged
while transitioning to split-screen mode from recents. We now check
for if the docked stack exists which is a better indicator we are in
split-screen mode regardless of if the stask is fullscreen.

Bug: 28882948
Bug: 28246419
Change-Id: I54c02cc1486e7b5bf6a20dd0706c9bfe3f40a953
 2016-05-23 09:10:24 -07:00
Bill Yi
a882b8c150 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 6a983faab3  -s ours

* commit '6a983faab35cc4f22611b0cb8041f4dcbac545dc':
  Import translations. DO NOT MERGE

Change-Id: If7150468a26a9a259b7696d2ee3594518ba0a213
 2016-05-23 15:57:49 +00:00
Bill Yi
712c2cb2d2 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7d1246e95d  -s ours

* commit '7d1246e95d0815424e6654af4ef613a7726551b1':
  Import translations. DO NOT MERGE

Change-Id: I320c2898acb42393e12e98e2b750bbc854f634d2
 2016-05-23 15:57:47 +00:00
Bill Yi
1a49e73d2a Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 05be3b4541  -s ours

* commit '05be3b454134afc73ae44cda88af10bead5324a6':
  Import translations. DO NOT MERGE

Change-Id: I94238461acc288413140d20799142aba4dd7c353
 2016-05-23 15:57:45 +00:00
TreeHugger Robot
6a983faab3 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:49:55 +00:00
Android Build Merger (Role)
bb434299c7 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours" into nyc-mr1-dev 2016-05-23 15:49:37 +00:00
Bill Yi
5d30133aa7 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: fa65d11a21  -s ours

* commit 'fa65d11a21700634a52311190f40d5fd64535e8e':
  Import translations. DO NOT MERGE

Change-Id: Ia8ce2502ca409b0f462803f0e08b4f0d19c6faa2
 2016-05-23 15:49:07 +00:00
TreeHugger Robot
18947ba2fa Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-23 15:48:46 +00:00
TreeHugger Robot
7b9f32be79 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-23 15:48:31 +00:00
TreeHugger Robot
7d1246e95d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:48:15 +00:00
TreeHugger Robot
05be3b4541 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:48:00 +00:00
TreeHugger Robot
2e354740de Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-23 15:47:04 +00:00
TreeHugger Robot
fa65d11a21 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:35:53 +00:00
TreeHugger Robot
bf97e34678 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-23 15:35:13 +00:00
Bill Yi
d5f7dc3e37 Import translations. DO NOT MERGE 
Change-Id: Ib90b6a912d4d92b18051d73e63aada7ff036678e
Auto-generated-cl: translation import
 2016-05-23 06:27:51 -07:00
Bill Yi
ea28bc9461 Import translations. DO NOT MERGE 
Change-Id: I6a67ee6c7f1c034eaea3885f13884f6c7add477d
Auto-generated-cl: translation import
 2016-05-23 06:21:44 -07:00
Victor Chang
8806a4bdc8 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev 
am: d86ac8116b

* commit 'd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I07d18fd5c472f1ab3f3ad4c37583e9092f4431b4
 2016-05-23 11:59:02 +00:00
Victor Chang
d86ac8116b Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev 2016-05-23 11:51:56 +00:00
Lorenzo Colitti
d755f9b86b Merge "Only actually log the DNS events we have." into nyc-dev 
am: cb98809657

* commit 'cb988096570de8af4883ae3bdea06c88f8fd235a':
  Only actually log the DNS events we have.

Change-Id: I97340d6b0483961d848e6f604a112636000675af
 2016-05-23 09:10:52 +00:00
Bill Yi
62da4a0c6d Import translations. DO NOT MERGE 
Change-Id: Iae2663ea18069432c84ffe5c4f01cf3cf8b1d7ff
Auto-generated-cl: translation import
 2016-05-23 02:03:02 -07:00
TreeHugger Robot
cb98809657 Merge "Only actually log the DNS events we have." into nyc-dev 2016-05-23 09:01:45 +00:00
Bill Yi
88a2eff6cb Import translations. DO NOT MERGE 
Change-Id: I23d94944484c50e6fae32f95b34406055078299e
Auto-generated-cl: translation import
 2016-05-23 01:53:03 -07:00
Bill Yi
95750c3ac9 Import translations. DO NOT MERGE 
Change-Id: I4bf63c7c9d2e24184607f05914e8e063e8792d45
Auto-generated-cl: translation import
 2016-05-23 01:47:37 -07:00
Bill Yi
a5c77a4738 Import translations. DO NOT MERGE 
Change-Id: I7c447305120cc398cbd0e7a98b8226ee7c632059
Auto-generated-cl: translation import
 2016-05-23 01:42:41 -07:00
Bill Yi
ddbfd7a471 Import translations. DO NOT MERGE 
Change-Id: Ic4303b94f9db348046f063592289d81b40bf88a9
Auto-generated-cl: translation import
 2016-05-23 01:39:59 -07:00
Bill Yi
cdf7b067d0 Import translations. DO NOT MERGE 
Change-Id: I22fbf5ac36b91251a267bbf1863ca1b1e914d032
Auto-generated-cl: translation import
 2016-05-23 01:20:28 -07:00
Lorenzo Colitti
c304a15751 Only actually log the DNS events we have. 
DnsEventListenerService#logAndClear was always logging 100 DNS
events regardless of how many were actually logged. The rest of
the events were either all zero or previously-recorded events.

Bug: 28204408
Change-Id: I9da3b07a2e7b7512397a3eb6568a877815eb3312
 2016-05-23 16:39:18 +09:00
Chad Brubaker
c6a49bb008 Merge "Use an attribute for the network security config resource" into nyc-dev 
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I470b8e991d590135223066d18b49ff123e0b1f6e
 2016-05-23 02:32:19 +00:00
TreeHugger Robot
6812bdf387 Merge "Use an attribute for the network security config resource" into nyc-dev 2016-05-23 02:23:26 +00:00
Baligh Uddin
713a057fb6 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 917ead578b  -s ours

* commit '917ead578baa6fba7e8e45756c67c879bb912364':
  Import translations. DO NOT MERGE

Change-Id: If76389179f7a687e1eefa96f629664b7e7bdbb21
 2016-05-22 23:34:36 +00:00
Baligh Uddin
9283938bc7 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7533f3260e  -s ours

* commit '7533f3260e888c6edc709b02eafdb5722172ecc2':
  Import translations. DO NOT MERGE

Change-Id: I8bb034309c4319df4caa65ae7b8124cb49ccb414
 2016-05-22 23:34:35 +00:00
Baligh Uddin
453a967a0c Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 41a1d11f98  -s ours

* commit '41a1d11f98d170ed41935d35fc1a3ed4af2c59fd':
  Import translations. DO NOT MERGE

Change-Id: Iff3f171fe3e678cfa9c16b2d01b87e4d5e949eeb
 2016-05-22 23:34:32 +00:00