OSDN Git Service
Tomasz Mikolajewski [Thu, 24 Mar 2016 09:43:46 +0000 (09:43 +0000)]
Merge "Make the activated root color darker in DocumentsUI for better a11y." into nyc-dev
am:
50c8d49
* commit '
50c8d49d4c3a633347e9c664729f550ef5bb08c0':
Make the activated root color darker in DocumentsUI for better a11y.
Janis Danisevskis [Thu, 24 Mar 2016 09:39:06 +0000 (09:39 +0000)]
Merge "Document restricted app private file permissions" into nyc-dev
am:
b52a874
* commit '
b52a874f3c73a7849f18f52f604b68478db69c00':
Document restricted app private file permissions
Tomasz Mikolajewski [Thu, 24 Mar 2016 09:37:57 +0000 (09:37 +0000)]
Merge "Make the activated root color darker in DocumentsUI for better a11y." into nyc-dev
Janis Danisevskis [Thu, 24 Mar 2016 09:33:44 +0000 (09:33 +0000)]
Merge "Document restricted app private file permissions" into nyc-dev
Tomasz Mikolajewski [Thu, 24 Mar 2016 08:02:46 +0000 (17:02 +0900)]
Make the activated root color darker in DocumentsUI for better a11y.
Bug:
27724950
Change-Id: Ie1150aae6e6dabe1dc460a99deec4ccfa48ec080
Robert Carr [Thu, 24 Mar 2016 05:50:09 +0000 (05:50 +0000)]
Merge "Transform app animator crop to child window space." into nyc-dev
am:
5c791ab
* commit '
5c791ab40ba191243b4bd0764afb18db68186d30':
Transform app animator crop to child window space.
Robert Carr [Thu, 24 Mar 2016 05:50:07 +0000 (05:50 +0000)]
Merge "Include animation layer adjustment even while docked." into nyc-dev
am:
5257488
* commit '
525748804e8ae2d6f26e50f5932e0b27e9fb1d3e':
Include animation layer adjustment even while docked.
Rob Carr [Thu, 24 Mar 2016 05:46:23 +0000 (05:46 +0000)]
Merge "Transform app animator crop to child window space." into nyc-dev
Rob Carr [Thu, 24 Mar 2016 05:45:58 +0000 (05:45 +0000)]
Merge "Include animation layer adjustment even while docked." into nyc-dev
sergeyv [Thu, 24 Mar 2016 05:07:10 +0000 (05:07 +0000)]
Merge "Add offset() to Path\'s fast-case mode" into nyc-dev
am:
ab852f2
* commit '
ab852f2972550d1ff6d6b9ec9ec85a9add16409c':
Add offset() to Path's fast-case mode
Sergei Vasilinetc [Thu, 24 Mar 2016 05:01:59 +0000 (05:01 +0000)]
Merge "Add offset() to Path's fast-case mode" into nyc-dev
Erik Kline [Thu, 24 Mar 2016 04:27:30 +0000 (04:27 +0000)]
Merge "Add "track default" type to NetworkRequestInfo" into nyc-dev
am:
3e4c79e4
* commit '
3e4c79e474dec39455895b3a4f2cff46c6d07c66':
Add "track default" type to NetworkRequestInfo
Erik Kline [Thu, 24 Mar 2016 04:20:21 +0000 (04:20 +0000)]
Merge "Add "track default" type to NetworkRequestInfo" into nyc-dev
Erik Kline [Tue, 22 Mar 2016 08:04:20 +0000 (17:04 +0900)]
Add "track default" type to NetworkRequestInfo
The "default network tracking" request is somewhere between a listen
and a request, in previous semantics. It is more like a listen in that
it doesn't cause any network to be brought up, but also like a request
in that will only get callbacks about a single network at a time (not
all networks that might match).
This change minimally splits the NetworkRequest types into 3: LISTEN,
REQUEST, and TRACK_DEFAULT.
Change-Id: I2d113b2f6eed526a7808592bce0118260a56f77c
Seigo Nonaka [Thu, 24 Mar 2016 03:51:27 +0000 (03:51 +0000)]
Merge "Add cursor positioning tests for emoji." into nyc-dev
am:
6ef4a1c
* commit '
6ef4a1c9cccfe667624a4e274ed306102c194dea':
Add cursor positioning tests for emoji.
Seigo Nonaka [Thu, 24 Mar 2016 03:45:55 +0000 (03:45 +0000)]
Merge "Add cursor positioning tests for emoji." into nyc-dev
Winson [Thu, 24 Mar 2016 03:32:22 +0000 (03:32 +0000)]
Merge "Adding workaround for crash." into nyc-dev
am:
0df18a1
* commit '
0df18a12bf58d3c1d3615f4240003e661a8d4798':
Adding workaround for crash.
Winson Chung [Thu, 24 Mar 2016 03:25:27 +0000 (03:25 +0000)]
Merge "Adding workaround for crash." into nyc-dev
Adrian Roos [Thu, 24 Mar 2016 03:00:19 +0000 (03:00 +0000)]
Merge "Scroll to remote input view" into nyc-dev
am:
93c687c
* commit '
93c687c4baaa2d7146cead6c9a47bb4ffd3e6511':
Scroll to remote input view
Daichi Hirono [Thu, 24 Mar 2016 02:53:35 +0000 (02:53 +0000)]
Merge "Use mipmap instead of drawable for app icon of DocumentsUI." into nyc-dev
am:
b2ef9ed
* commit '
b2ef9ed7c4e8997c9c851c587da37248ab81236e':
Use mipmap instead of drawable for app icon of DocumentsUI.
Adrian Roos [Thu, 24 Mar 2016 02:52:31 +0000 (02:52 +0000)]
Merge "Scroll to remote input view" into nyc-dev
Daichi Hirono [Thu, 24 Mar 2016 02:50:17 +0000 (02:50 +0000)]
Merge "Use mipmap instead of drawable for app icon of DocumentsUI." into nyc-dev
Anju Mathapati [Thu, 24 Mar 2016 02:46:47 +0000 (02:46 +0000)]
Merge "IMS: Changes for MultiEndpoint" into nyc-dev
am:
0e3aff1
* commit '
0e3aff1ab5c0cf0bb200910b10a81173d6d607a5':
IMS: Changes for MultiEndpoint
Tyler Gunn [Thu, 24 Mar 2016 02:39:07 +0000 (02:39 +0000)]
Merge "IMS: Changes for MultiEndpoint" into nyc-dev
Winson [Thu, 24 Mar 2016 02:33:40 +0000 (02:33 +0000)]
Merge changes I84516d07,I1da274bf,Ie478c562,I1eac1dce into nyc-dev
am:
aebbf29
* commit '
aebbf299641afd0397855cef987d7dc7a03b7dae':
Tweaking scroll-to-launch task animation.
Completely removing dead code related to history view.
Completely removing dead code related to search widget.
Iterating on stack layout
Winson Chung [Thu, 24 Mar 2016 02:29:30 +0000 (02:29 +0000)]
Merge changes I84516d07,I1da274bf,Ie478c562,I1eac1dce into nyc-dev
* changes:
Tweaking scroll-to-launch task animation.
Completely removing dead code related to history view.
Completely removing dead code related to search widget.
Iterating on stack layout
Winson [Thu, 24 Mar 2016 02:00:28 +0000 (19:00 -0700)]
Adding workaround for crash.
Bug:
27815919
Change-Id: I04d70d16dd8b8281ba1ffbba056d475d834d5b54
Anju Mathapati [Thu, 10 Mar 2016 20:57:21 +0000 (12:57 -0800)]
IMS: Changes for MultiEndpoint
- Change in api names
Change-Id: I9317c391d0017f5079ab488abe0bd1e949317bce
Tyler Gunn [Thu, 24 Mar 2016 02:18:20 +0000 (02:18 +0000)]
Merge "Expand call/connection extras API." into nyc-dev
am:
e5d79e2
* commit '
e5d79e245cfd48f69a8b2d9f44aeeab1a9e57b51':
Expand call/connection extras API.
Tyler Gunn [Thu, 24 Mar 2016 02:13:45 +0000 (02:13 +0000)]
Merge "Expand call/connection extras API." into nyc-dev
Andreas Gampe [Thu, 24 Mar 2016 02:08:01 +0000 (02:08 +0000)]
Merge "Frameworks/base: Refactor package manager" into nyc-dev
am:
a7f2bcc
* commit '
a7f2bccca3f27a2ad12397ffb52d47fceea76018':
Frameworks/base: Refactor package manager
Winson [Thu, 24 Mar 2016 01:44:26 +0000 (18:44 -0700)]
Tweaking scroll-to-launch task animation.
- Always scroll so that the launch task is focused
Change-Id: I84516d0799ad0b308cfa458f4ce79c82acc48f51
Andreas Gampe [Thu, 24 Mar 2016 01:59:22 +0000 (01:59 +0000)]
Merge "Frameworks/base: Refactor package manager" into nyc-dev
Winson [Sat, 19 Mar 2016 00:51:48 +0000 (17:51 -0700)]
Completely removing dead code related to history view.
- This CL repurposes the history button above the stack to a more
generic “stack action” button in preparation for a future change.
Bug:
27742174
Change-Id: I1da274bf88c77bdc09d91072683b2ea7ca022432
Winson [Sat, 19 Mar 2016 00:17:25 +0000 (17:17 -0700)]
Completely removing dead code related to search widget.
Bug:
27742174
Change-Id: Ie478c562f6152338417aca5262b7f33ee4ca7ed5
Jaesung Chung [Thu, 24 Mar 2016 01:48:06 +0000 (01:48 +0000)]
Merge "ExifInterface: fix creating pointer tags which indicate 0 offset" into nyc-dev
am:
e468a67
* commit '
e468a67d591225da928a49b783e01622cb2390c7':
ExifInterface: fix creating pointer tags which indicate 0 offset
Winson [Thu, 17 Mar 2016 21:13:18 +0000 (14:13 -0700)]
Iterating on stack layout
- Tweaking initial layout to show more of the next task
- Bounding the width of the stack to the smallest display edge length
- Fixing issue where the screen pinning button was not shown when
entering recents from home, and the task view clip state was not
restored correctly for tasks in front of the launch task.
- Fixing issue where there was no alpha during the transition to/from
home
- Refactoring and removing unused dimens, and moved remaining layout
calculation logic out of RecentsConfiguration.
- Fixing small regression in finding task anchor scroll points. This
caused tasks to be animated strangely when swiping to dismiss and
the task had an override task progress.
- Fixing several regressions in drag and drop due to override progresses
Change-Id: I1eac1dcea19e502bc7fe6362011b38977e3f3d6d
Jaesung Chung [Thu, 24 Mar 2016 01:43:05 +0000 (01:43 +0000)]
Merge "ExifInterface: fix creating pointer tags which indicate 0 offset" into nyc-dev
Jaewan Kim [Thu, 24 Mar 2016 01:35:11 +0000 (01:35 +0000)]
Merge "Refactor SystemServicesProxy to manage ITaskStackListener locally" into nyc-dev
am:
98551e4
* commit '
98551e43b5e32a0af0b9cbb91d96dfbb7c9b7d56':
Refactor SystemServicesProxy to manage ITaskStackListener locally
Jaewan Kim [Thu, 24 Mar 2016 01:31:40 +0000 (01:31 +0000)]
Merge "Refactor SystemServicesProxy to manage ITaskStackListener locally" into nyc-dev
Sergey Vasilinets [Thu, 24 Mar 2016 01:28:46 +0000 (01:28 +0000)]
Merge "Fix NinePatch insets scaling" into nyc-dev
am:
5d83f69
* commit '
5d83f69fcdd4a7f46ead2896db42e0689af31a89':
Fix NinePatch insets scaling
Jaewan Kim [Mon, 14 Mar 2016 08:35:43 +0000 (17:35 +0900)]
Refactor SystemServicesProxy to manage ITaskStackListener locally
This reduces the IPC calls between system service and SystemUI app.
Bug:
27635150
Change-Id: I6886edbc8e3736416af06c8de204f2a3b470ccd1
Sergei Vasilinetc [Thu, 24 Mar 2016 01:22:06 +0000 (01:22 +0000)]
Merge "Fix NinePatch insets scaling" into nyc-dev
Adrian Roos [Tue, 22 Mar 2016 17:01:56 +0000 (10:01 -0700)]
Scroll to remote input view
Bug:
27668960
Fixes:
27668960
Change-Id: Ie8f7858257922362b289ea4e4e22e689e1405e58
Aga Wronska [Thu, 24 Mar 2016 00:46:57 +0000 (00:46 +0000)]
Merge "Add guard to access drawer toolbar when setting accessibility, because this toolbar does not exist in fixed_layout mode." into nyc-dev
am:
1334376
* commit '
1334376d1d110a5d50d5a4814ac1c79edfe199dd':
Add guard to access drawer toolbar when setting accessibility, because this toolbar does not exist in fixed_layout mode.
Tomasz Mikolajewski [Thu, 24 Mar 2016 00:46:55 +0000 (00:46 +0000)]
Merge "Fix testModelIdIsUnique test in DocumentsUI." into nyc-dev
am:
378f409
* commit '
378f4090342e46496dc034333e3b1030ee265327':
Fix testModelIdIsUnique test in DocumentsUI.
Aga Wronska [Thu, 24 Mar 2016 00:43:19 +0000 (00:43 +0000)]
Merge "Add guard to access drawer toolbar when setting accessibility, because this toolbar does not exist in fixed_layout mode." into nyc-dev
Tomasz Mikolajewski [Thu, 24 Mar 2016 00:40:06 +0000 (00:40 +0000)]
Merge "Fix testModelIdIsUnique test in DocumentsUI." into nyc-dev
sergeyv [Tue, 22 Mar 2016 20:54:24 +0000 (13:54 -0700)]
Add offset() to Path's fast-case mode
bug:
22510833
Change-Id: I417ed13ff450aa7f6c72370b4c5de8e8a53a0235
Andreas Gampe [Sun, 20 Mar 2016 18:32:11 +0000 (11:32 -0700)]
Frameworks/base: Refactor package manager
Introduce a mapping between dexopt reasons and compiler filters. Use
reasons in package manager and other classes, where possible.
Change PackageDexOptimizer to accept a compilation filter. Adapt for
the split-out profile merging. Pass compilation filter to installd.
Bug:
27689078
Change-Id: I8c0ea6f10fbfdbd096adecc52abfd2466d048fdc
Tyler Gunn [Wed, 23 Mar 2016 23:06:34 +0000 (16:06 -0700)]
Expand call/connection extras API.
Currently, connection extras are propagated up to Telecom as an
entire bundle. This is not ideal, as any time a change is made to
the extras, the bundle needs to be fetched, changed, and then re-set on
the connection, where it is parceled to Telecom as a whole.
Using how extras on an Intent as inspiration, this CL adds separate
putExtras, putExtra, and removeExtra methods to allow manipulation of
the extras bundle without operating on it in its entirety.
This Cl also adds support for Calls modifying the extras bundle, with
changes propagated back down to ConnectionServices.
Bug:
27458894
Change-Id: I152340a3bca2dc03f170b06b172a6823410fb961
Chad Brubaker [Wed, 23 Mar 2016 22:50:01 +0000 (22:50 +0000)]
Merge "Properly handle whitespace in domain entries" into nyc-dev
am:
2e6aa19
* commit '
2e6aa196bc00c7b8f65a513f1dcf0712af500a10':
Properly handle whitespace in domain entries
Chad Brubaker [Wed, 23 Mar 2016 22:44:09 +0000 (22:44 +0000)]
Merge "Properly handle whitespace in domain entries" into nyc-dev
fionaxu [Wed, 23 Mar 2016 22:40:06 +0000 (22:40 +0000)]
Merge " fix Memory Leak caused by PhoneStateListener" into nyc-dev
am:
3c11a5b
* commit '
3c11a5b3f881c433a9b6885735dfd0d8d3f311a7':
fix Memory Leak caused by PhoneStateListener
Amith Yamasani [Wed, 23 Mar 2016 22:40:05 +0000 (22:40 +0000)]
Merge "Localize owner\'s name to current locale until changed" into nyc-dev
am:
df4c40d
* commit '
df4c40df2f49ec4366dd2c549c0f30e5262af49b':
Localize owner's name to current locale until changed
Adam Powell [Wed, 23 Mar 2016 22:40:03 +0000 (22:40 +0000)]
Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev
am:
30ac43e
* commit '
30ac43e4acc4ed5673ea40d6643e36fadec5411c':
Fix bugs around restoring nested retained instance fragments
Chen Xu [Wed, 23 Mar 2016 22:37:20 +0000 (22:37 +0000)]
Merge " fix Memory Leak caused by PhoneStateListener" into nyc-dev
Amith Yamasani [Wed, 23 Mar 2016 22:33:15 +0000 (22:33 +0000)]
Merge "Localize owner's name to current locale until changed" into nyc-dev
Dan Willemsen [Wed, 23 Mar 2016 22:31:32 +0000 (15:31 -0700)]
resolve merge conflicts of
8416096 to nyc-dev-plus-aosp
Change-Id: I1638601fe84dda01bf52c59eb6c976bc1fe37498
Chad Brubaker [Wed, 23 Mar 2016 21:59:14 +0000 (14:59 -0700)]
Properly handle whitespace in domain entries
Domain entries can contain whitespace (or newlines) which should be
ignored to avoid unexpectedly failing to match a domain.
Bug:
27816377
Change-Id: I3691aa4abd409e7be97ad0cf1eb0195725e1b0ab
Adam Powell [Wed, 23 Mar 2016 22:27:30 +0000 (22:27 +0000)]
Merge "Fix bugs around restoring nested retained instance fragments" into nyc-dev
Kenny Root [Wed, 23 Mar 2016 22:21:05 +0000 (22:21 +0000)]
Merge "Use canonical name for SHA1withECDSA" into nyc-dev
am:
4bbe428
* commit '
4bbe428418d64e240a9a26438d199b156e8fc831':
Use canonical name for SHA1withECDSA
Wale Ogunwale [Wed, 23 Mar 2016 22:21:03 +0000 (22:21 +0000)]
Merge "Don\'t save secure surfaces." into nyc-dev
am:
b173b7c
* commit '
b173b7c8d8bf8b76931afcf691147d1ad10ef65f':
Don't save secure surfaces.
Kenny Root [Wed, 23 Mar 2016 22:17:04 +0000 (22:17 +0000)]
Merge "Use canonical name for SHA1withECDSA" into nyc-dev
Aga Wronska [Wed, 23 Mar 2016 22:11:25 +0000 (15:11 -0700)]
Add guard to access drawer toolbar when setting accessibility, because this toolbar does not exist in
fixed_layout mode.
Change-Id: Iaccbdf848b7d1e9ccb7c4cca3afd153a2246e68d
Fixed:
27812831
Wale Ogunwale [Wed, 23 Mar 2016 22:14:04 +0000 (22:14 +0000)]
Merge "Don't save secure surfaces." into nyc-dev
Samuel Tan [Wed, 23 Mar 2016 22:11:17 +0000 (22:11 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab am:
3253022 am:
f4fd201 -s ours am:
1450b69 am:
1d508de am:
3b2ed11 am:
070b76e -s ours
am:
96fe195
* commit '
96fe195bddf11371177c868f534e3e1f988b2c83':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 22:08:31 +0000 (22:08 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab am:
3253022 am:
f4fd201 -s ours am:
1450b69 am:
1d508de am:
3b2ed11
am:
070b76e -s ours
* commit '
070b76e52100f0b9d2ce45f2884c639507c4c7d2':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Dan Willemsen [Wed, 23 Mar 2016 22:08:15 +0000 (22:08 +0000)]
Merge "Remove custom copy rules, stop using ACP"
am:
72dd79f
* commit '
72dd79fa41fad71a14bb82eb830c927299d92d02':
Remove custom copy rules, stop using ACP
Samuel Tan [Wed, 23 Mar 2016 22:05:50 +0000 (22:05 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab am:
3253022 am:
f4fd201 -s ours am:
1450b69 am:
1d508de
am:
3b2ed11
* commit '
3b2ed11851f342f01bef3832e8603122698a3588':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:58:28 +0000 (21:58 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab am:
3253022 am:
f4fd201 -s ours am:
1450b69
am:
1d508de
* commit '
1d508decacf84e26db6164d30006166e0fc74f5f':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:53:57 +0000 (21:53 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab am:
3253022 am:
f4fd201 -s ours
am:
1450b69
* commit '
1450b69182fd9b360d9dd4ec54d431560eb775e6':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:53:53 +0000 (21:53 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d8c3ca4 am:
542bb73 am:
fbfd7d0 am:
7dfe3d4 -s ours
am:
fbc98e1
* commit '
fbc98e1c30e9ef6827f0dcd8024b0fd2de28cf33':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Yohei Yukawa [Wed, 23 Mar 2016 21:53:50 +0000 (21:53 +0000)]
Merge "Make sure to call back reportFinish() on the desired Handler." into nyc-dev
am:
2c8d528
* commit '
2c8d528188f2ac9e482fe29d06ca5eb683be9b87':
Make sure to call back reportFinish() on the desired Handler.
Samuel Tan [Wed, 23 Mar 2016 21:51:40 +0000 (21:51 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d8c3ca4 am:
542bb73 am:
fbfd7d0
am:
7dfe3d4 -s ours
* commit '
7dfe3d4457cd3ff952c65c7fe0816e19b42e945f':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:49:16 +0000 (21:49 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab am:
3253022
am:
f4fd201 -s ours
* commit '
f4fd20168fdf1ee19da63cc82c0893a288d8b759':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Yohei Yukawa [Wed, 23 Mar 2016 21:48:50 +0000 (21:48 +0000)]
Merge "Make sure to call back reportFinish() on the desired Handler." into nyc-dev
Dan Willemsen [Wed, 23 Mar 2016 21:47:00 +0000 (21:47 +0000)]
Merge "Remove custom copy rules, stop using ACP"
Samuel Tan [Wed, 23 Mar 2016 21:45:25 +0000 (21:45 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab
am:
3253022
* commit '
325302206a0129bdf16a486232d5864d71e62a44':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:45:23 +0000 (21:45 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d8c3ca4 am:
542bb73
am:
fbfd7d0
* commit '
fbfd7d0c91ef84d12ca036462b54794076d06cdc':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Kenny Root [Wed, 23 Mar 2016 21:40:50 +0000 (21:40 +0000)]
Merge "Use canonical name for SHA1withECDSA" am:
4a0497c
am:
fa733d0
* commit '
fa733d0b70b891a04358faac75fc55fb035a98cd':
Use canonical name for SHA1withECDSA
Samuel Tan [Wed, 23 Mar 2016 21:40:45 +0000 (21:40 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours
am:
c2712ab
* commit '
c2712ab7bd3bdeaf8945bc80154f402e1cf727bc':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:40:23 +0000 (21:40 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d8c3ca4
am:
542bb73
* commit '
542bb7307b2bf3dab337b56e392b778896f88ec6':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Xiaohui Chen [Wed, 23 Mar 2016 21:35:43 +0000 (21:35 +0000)]
Merge "sysui: refactor for extensibility" into nyc-dev
am:
0997bc8
* commit '
0997bc8a85c7d7a83e0f590432d10fab89f2c900':
sysui: refactor for extensibility
Samuel Tan [Wed, 23 Mar 2016 21:35:32 +0000 (21:35 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings
am:
d385a6d -s ours
* commit '
d385a6d95fc830ecc8d55937e9f46b14165d4b34':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:35:30 +0000 (21:35 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings
am:
d8c3ca4
* commit '
d8c3ca43163427a75c8b70114096238177f97af0':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Kenny Root [Wed, 23 Mar 2016 21:35:29 +0000 (21:35 +0000)]
Merge "Use canonical name for SHA1withECDSA"
am:
4a0497c
* commit '
4a0497c8e47f2775aa5787cf624abd24680e5950':
Use canonical name for SHA1withECDSA
Kenny Root [Wed, 23 Mar 2016 15:52:25 +0000 (08:52 -0700)]
Use canonical name for SHA1withECDSA
The Standard Names documentation says that "ECDSA" should not be used
due to its ambiguity. Bouncycastle has switched from "ECDSA" to
"SHA1withECDSA" so therefore we should switch this "workaround" Provider
to use the same name to keep it functioning correctly.
(cherry picked from commit
8a6c191094b3d1f74dbb71a7f262496377596ba8)
Bug:
27753949
Change-Id: I5acfca9d89c85bf005902a2f06cb5d7b1ef9dff2
Kenny Root [Wed, 23 Mar 2016 21:29:00 +0000 (21:29 +0000)]
Merge "Use canonical name for SHA1withECDSA"
Amith Yamasani [Wed, 23 Mar 2016 21:28:25 +0000 (14:28 -0700)]
Localize owner's name to current locale until changed
Don't set a name for the system user and always return a localized
name until the user explicitly sets a name.
Bug:
27814125
Change-Id: I7972a45d77c07d9efbd67d5b360bacee46247a66
Xiaohui Chen [Wed, 23 Mar 2016 21:24:10 +0000 (21:24 +0000)]
Merge "sysui: refactor for extensibility" into nyc-dev
fionaxu [Tue, 22 Mar 2016 22:09:55 +0000 (15:09 -0700)]
fix Memory Leak caused by PhoneStateListener
Bug:
22962661
Change-Id: Ibece746afc19dd6b71845a257b7bfb88a0f8e13f
Deepanshu Gupta [Wed, 23 Mar 2016 20:57:21 +0000 (20:57 +0000)]
Merge "Exclude java namespace classes from layoutlib" into nyc-dev
am:
3e2b413
* commit '
3e2b413dc72f267571421cfb0c8ced7a4778704a':
Exclude java namespace classes from layoutlib
Philip P. Moltmann [Wed, 23 Mar 2016 20:48:59 +0000 (20:48 +0000)]
Merge "Remove unnecessary strings and labels." into nyc-dev
am:
a785c80
* commit '
a785c80a5ec3cdd4c14dc8519a2d8cbcc716a0f2':
Remove unnecessary strings and labels.
Rebecca Silberstein [Wed, 23 Mar 2016 20:48:57 +0000 (20:48 +0000)]
Merge "handle wifi interface changes with interfaceRemoved" into nyc-dev
am:
602123a
* commit '
602123a14ac316fe0d08a9417f3d38f7d566c83b':
handle wifi interface changes with interfaceRemoved
Deepanshu Gupta [Wed, 23 Mar 2016 20:48:13 +0000 (20:48 +0000)]
Merge "Exclude java namespace classes from layoutlib" into nyc-dev
Philip P. Moltmann [Wed, 23 Mar 2016 20:45:33 +0000 (20:45 +0000)]
Merge "Remove unnecessary strings and labels." into nyc-dev
Dan Willemsen [Wed, 23 Mar 2016 07:42:44 +0000 (00:42 -0700)]
Remove custom copy rules, stop using ACP
Replace some custom rules with BUILD_PREBUILT.
Move tools from ALL_PREBUILTS to BUILD_PREBUILT. All of them are already
in PRODUCT_PACKAGES in build/target/product/base.mk.
Remove uses of ACP and replace with core build system macros or 'cp'
Change-Id: I529e7c6c50fc64ad36b75bb47142f6bde909d141
Rebecca Silberstein [Wed, 23 Mar 2016 20:41:05 +0000 (20:41 +0000)]
Merge "handle wifi interface changes with interfaceRemoved" into nyc-dev
Philip P. Moltmann [Wed, 23 Mar 2016 20:30:58 +0000 (13:30 -0700)]
Remove unnecessary strings and labels.
Bug:
27815807
Change-Id: I6388055938afbbadc954c913ce0554f9a4a313e8