Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
219,234 Commits 3 Branches 0 Tags
3f669082aa98ba264ca9158cbce352d82191cb4a
Commit Graph

219234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
3f669082aa Merge "Allowing multiple preferred drag regions for tablets." 2015-10-12 18:38:59 +00:00
Winson
882072baac Allowing multiple preferred drag regions for tablets. 
Change-Id: I514e501d185f4139ce21798fc92bc931626c8239
 2015-10-12 11:26:33 -07:00
Wale Ogunwale
446433da24 am 4b6a829a: am 83a39080: am 1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing." 
* commit '4b6a829ac2c7af671f131a738437f1e393b13ec6':
  Fix resumeHomeStackTask can't resume home if activity is finishing.
 2015-10-12 17:13:47 +00:00
Geoff Mendal
b4c0ad9775 am 94127464: (-s ours) am 99ec3595: (-s ours) am ef2f6596: (-s ours) am ac3b53a7: (-s ours) Import translations. DO NOT MERGE 
* commit '94127464b460b65ca6689e1c5156789decca8488':
  Import translations. DO NOT MERGE
 2015-10-12 17:13:36 +00:00
Pirama Arumuga Nainar
de5fe60afb am e1ffb406: am 05f0dc28: am d5992114: Merge "Fix punctuation and typos in AllocationAdapter\'s documentation." 
* commit 'e1ffb406edd5f7bc224669a2f544fad26aff1d31':
  Fix punctuation and typos in AllocationAdapter's documentation.
 2015-10-12 17:13:00 +00:00
Lorenzo Colitti
6bb16f4291 am 068da682: am 553a934c: am 647ec7f8: am 4e4d59ee: Connect the DHCP UDP socket to the server. 
* commit '068da68200ce5551f1a77ac1e83a3c5157c35701':
  Connect the DHCP UDP socket to the server.
 2015-10-12 17:12:19 +00:00
Lorenzo Colitti
eda0ea4190 am 3d3f766c: am 871d96b4: am 13c5dd5c: am eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev 
* commit '3d3f766c8b37dcf495235ca4a500494498712eed':
  Support DHCP replies with multiple default gateways.
  Accept DHCP responses from non-67 server source ports
  Improve logging of DHCP parse errors using exceptions.
 2015-10-12 17:12:08 +00:00
Geoff Mendal
c8b71bec12 Merge "Import translations. DO NOT MERGE" 2015-10-12 16:16:16 +00:00
Geoff Mendal
82221b0800 Import translations. DO NOT MERGE 
Change-Id: Ibf32d55ddcff08c2e57d082666b4121a5a767054
Auto-generated-cl: translation import
 2015-10-12 11:11:48 -05:00
Tony Mantler
bae1aecfa4 Merge "Move DreamBackend to SettingsLib" 2015-10-12 15:56:54 +00:00
Wale Ogunwale
4b6a829ac2 am 83a39080: am 1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing." 
* commit '83a3908047f3438c5daf7c3b562cf9ad8fe76d71':
  Fix resumeHomeStackTask can't resume home if activity is finishing.
 2015-10-12 14:50:32 +00:00
Wale Ogunwale
83a3908047 am 1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing." 
* commit '1ca9f4812749a3eff0654e2ea7773e8b3704c1da':
  Fix resumeHomeStackTask can't resume home if activity is finishing.
 2015-10-12 14:44:46 +00:00
Wale Ogunwale
1ca9f48127 Merge "Fix resumeHomeStackTask can't resume home if activity is finishing." 2015-10-12 14:39:16 +00:00
Geoff Mendal
94127464b4 am 99ec3595: (-s ours) am ef2f6596: (-s ours) am ac3b53a7: (-s ours) Import translations. DO NOT MERGE 
* commit '99ec3595002f98e4c67a8c23e8ef33590e460235':
  Import translations. DO NOT MERGE
 2015-10-12 14:34:53 +00:00
Geoff Mendal
99ec359500 am ef2f6596: (-s ours) am ac3b53a7: (-s ours) Import translations. DO NOT MERGE 
* commit 'ef2f659641d3eec9129ad726176c27818cc9d4d0':
  Import translations. DO NOT MERGE
 2015-10-12 14:27:25 +00:00
Geoff Mendal
ef2f659641 am ac3b53a7: (-s ours) Import translations. DO NOT MERGE 
* commit 'ac3b53a734df0ec994d6068b7c0331da1fa0aa80':
  Import translations. DO NOT MERGE
 2015-10-12 14:20:03 +00:00
Geoff Mendal
ac3b53a734 Import translations. DO NOT MERGE 
Change-Id: I24c1dbc83857fa0af6a57d0a834fcda1394fd313
Auto-generated-cl: translation import
 2015-10-12 07:03:29 -07:00
Geoff Mendal
b52b18050a Merge "Import translations. DO NOT MERGE" 2015-10-12 13:00:47 +00:00
Geoff Mendal
5f619ac7ad Import translations. DO NOT MERGE 
Change-Id: I968bf0b2a23bb1b1d15fb7a56880941c85c5a78b
Auto-generated-cl: translation import
 2015-10-12 05:55:27 -07:00
Geoff Mendal
dc30cd2062 Import translations. DO NOT MERGE 
Change-Id: I4f298a5bce23a006e6e77bdb199a8e4b5fd37a98
Auto-generated-cl: translation import
 2015-10-12 05:11:44 -07:00
Mark Lu
a56ea12ca5 Fix resumeHomeStackTask can't resume home if activity is finishing. 
Not to resume home activity in finishing stage as following case:

When only home task has 2 activities,
(ex: SetupWizard & DeviceOwnerProvisioningActivity),

If SetupWizard crashed during DeviceOwnerProvisioningActivity in
finishing stage,
makes DeviceOwnerProvisioningActivity cannot destroy immediately,
In resumeHomeStackTask, will resume DeviceOwnerProvisioningActivity
(returned by getHomeActivity),
But actually, DeviceOwnerProvisioningActivity cannot be resumed.
Caused ANR when back key since no more running activity can resume.

Change-Id: Icec49e092d2e7bee7f6a2d198913c1c5db7122f2
 2015-10-12 06:36:24 +00:00
Jinsuk Kim
f98b9e87f9 CEC: Process missing port/device select request 
The timing issue cause some port/device select request
to return error if made while the service is being initialized
waking up from sleep.

This CL buffers the request so that it can be handled as
expected once the service initialization and device discovery
is completed.

Bug: 23084229
Change-Id: I8bcdaf3b708c6b9bf75ea15304c08bd35bd0f6d0
(cherry picked from commit d0b01dfe0aaebd054165dfe2f5f4bd7d68703970)
 2015-10-11 23:00:23 +00:00
Pirama Arumuga Nainar
e1ffb406ed am 05f0dc28: am d5992114: Merge "Fix punctuation and typos in AllocationAdapter\'s documentation." 
* commit '05f0dc2891377ab21b3a4262e9f5dc6fc768a2af':
  Fix punctuation and typos in AllocationAdapter's documentation.
 2015-10-11 18:07:37 +00:00
Lorenzo Colitti
068da68200 am 553a934c: am 647ec7f8: am 4e4d59ee: Connect the DHCP UDP socket to the server. 
* commit '553a934c47ec255b84647fa8e603bd4edf8fd7cd':
  Connect the DHCP UDP socket to the server.
 2015-10-11 14:20:04 +00:00
Lorenzo Colitti
3d3f766c8b am 871d96b4: am 13c5dd5c: am eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev 
* commit '871d96b44c9665238d1df87ed89656f742abe2fa':
  Support DHCP replies with multiple default gateways.
  Accept DHCP responses from non-67 server source ports
  Improve logging of DHCP parse errors using exceptions.
 2015-10-11 14:19:58 +00:00
Lorenzo Colitti
553a934c47 am 647ec7f8: am 4e4d59ee: Connect the DHCP UDP socket to the server. 
* commit '647ec7f80e46aa7c9b251d942bc2862646b57b3f':
  Connect the DHCP UDP socket to the server.
 2015-10-11 14:11:31 +00:00
Lorenzo Colitti
871d96b44c am 13c5dd5c: am eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev 
* commit '13c5dd5c19c5bcc60910b4e37f4e9e171adf099b':
  Support DHCP replies with multiple default gateways.
  Accept DHCP responses from non-67 server source ports
  Improve logging of DHCP parse errors using exceptions.
 2015-10-11 14:11:25 +00:00
Lorenzo Colitti
647ec7f80e am 4e4d59ee: Connect the DHCP UDP socket to the server. 
* commit '4e4d59eeef86fa8560d35c00168869b0a066f962':
  Connect the DHCP UDP socket to the server.
 2015-10-11 13:43:34 +00:00
Lorenzo Colitti
13c5dd5c19 am eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev 
* commit 'eb0bbd45f62fcaff26151b54a7b3ea16bb67e3be':
  Support DHCP replies with multiple default gateways.
  Accept DHCP responses from non-67 server source ports
  Improve logging of DHCP parse errors using exceptions.
 2015-10-11 13:43:24 +00:00
Lorenzo Colitti
4e4d59eeef Connect the DHCP UDP socket to the server. 
This makes it so that the socket cannot receive datagrams from
anybody except the DHCP server. This does not improve security,
because we never read from the UDP socket anyway, but it does
make ListeningPortsTest pass.

Bug: 23906864
Bug: 23933386
Change-Id: Ib090273a417f7eb2ac1ee3309260249b72fb8345
 2015-10-11 16:06:11 +09:00
Lorenzo Colitti
eb0bbd45f6 Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev 
* changes:
  Support DHCP replies with multiple default gateways.
  Accept DHCP responses from non-67 server source ports
  Improve logging of DHCP parse errors using exceptions.
 2015-10-11 06:48:33 +00:00
Winson Chung
69b90e942d Merge "Fixing merge issue with last CL." 2015-10-10 21:52:30 +00:00
Winson
09d8a184c6 Fixing merge issue with last CL. 
Change-Id: I71444dafd11427e47387b0652664be21af0c5651
 2015-10-10 14:50:23 -07:00
Winson Chung
caed947267 Merge "Fixing crash when dragging tasks to docked state." 2015-10-10 21:46:09 +00:00
Winson
4165d336b6 Fixing crash when dragging tasks to docked state. 
- Also tweaking animation when a task is first picked up.

Change-Id: Idf99c88fdb216823637e2436e54b392b661b9849
 2015-10-10 14:44:33 -07:00
Winson Chung
b53abe7484 Merge "Tweaking animation after dismissing task." 2015-10-10 19:09:10 +00:00
Winson
42be431c3d Tweaking animation after dismissing task. 
Change-Id: Ia85e876ec08f4103ff5c3799309cf4731922624f
 2015-10-10 11:51:08 -07:00
Steve McKay
e1b924921a Merge "Rename "recyclerView" to "list" fixing some of CTS." 2015-10-10 15:54:20 +00:00
Steve McKay
d20f87dad8 Rename "recyclerView" to "list" fixing some of CTS. 
Bug: 24544391
Change-Id: I2ca74e2a007ec733092d4cb3f84b40c64392c766
 2015-10-10 15:53:26 +00:00
Dianne Hackborn
2f6aa4a0e5 am 212fdb2d: am 4b77f2e5: am 94252b62: am 09e405d6: Merge "Fix issue #24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev 
* commit '212fdb2d1c79cdd6c93dab5b8b32f9118d73a6d9':
  Fix issue #24743380: VoiceInteractionManagerService doesn't use current...
 2015-10-10 01:11:55 +00:00
Dianne Hackborn
212fdb2d1c am 4b77f2e5: am 94252b62: am 09e405d6: Merge "Fix issue #24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev 
* commit '4b77f2e53dba8288642aa6223658560eb2faeaf5':
  Fix issue #24743380: VoiceInteractionManagerService doesn't use current...
 2015-10-10 01:06:27 +00:00
Dianne Hackborn
4b77f2e53d am 94252b62: am 09e405d6: Merge "Fix issue #24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev 
* commit '94252b62079f8c852daca62d834d1680e3a602da':
  Fix issue #24743380: VoiceInteractionManagerService doesn't use current...
 2015-10-10 00:56:59 +00:00
Dianne Hackborn
94252b6207 am 09e405d6: Merge "Fix issue #24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev 
* commit '09e405d660c0fe696402d10732084888192ca446':
  Fix issue #24743380: VoiceInteractionManagerService doesn't use current...
 2015-10-10 00:48:41 +00:00
Dianne Hackborn
09e405d660 Merge "Fix issue #24743380: VoiceInteractionManagerService doesn't use current..." into mnc-dr-dev 2015-10-10 00:42:02 +00:00
Hall Liu
60404b311b Merge "Add TelecomManager constructor for passing in TelecomServiceImpl override" 2015-10-09 23:33:13 +00:00
Hall Liu
e1bc2ec710 Add TelecomManager constructor for passing in TelecomServiceImpl 
override

Bug: 24618535
Change-Id: I2dafcc9ab496de94eb6a6894916030ed4e7556f8
 2015-10-09 16:31:10 -07:00
Dianne Hackborn
958b9d2ecc Fix issue #24743380: VoiceInteractionManagerService doesn't use current... 
...user for service info

Now it does.

The actual change is basically one line, passing in the current user
when building the service info.  The rest is more debugging output to
be able to see what is going on.

Change-Id: I451884e0780aac6ee92fd2cd520071894afdf586
 2015-10-09 16:09:25 -07:00
Winson Chung
6b538cc223 Merge "Cleaning up stack layout." 2015-10-09 22:37:25 +00:00
Winson
88f00ab1df Cleaning up stack layout. 
- Refactoring the layout to remove unused (and confusing) variables, 
  reducing the number of calculations when updating min/max bounds, and
  allow more accurate tracking of stack positions (for attached views).
- Tweaking the transform for single-task stacks so that they behave 
  better.
- Removing old, unused dismiss-all ui.

Change-Id: I8ec3bf062b0451543bd8a297aa810405f68c84cb
 2015-10-09 15:29:23 -07:00
Deepanshu Gupta
b072ff9e41 am 467f6a4f: am 2aa403fe: Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev 
* commit '467f6a4f0d788fa0bad86bb6545a8254912b99b0':
  LayoutLib: Fix android:dependency for preferences.
 2015-10-09 22:09:56 +00:00