Commit Graph

301953 Commits

Author SHA1 Message Date
Neil Fuller
c423d00016 Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980 am: ef34053f26
am: 9103632f9d

Change-Id: I3b2b8355d80dca87a09ef97027753bcd568cff14
2016-11-15 17:11:40 +00:00
Neil Fuller
9103632f9d Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980
am: ef34053f26

Change-Id: I3724485cc956b2d5a64a6e71f325181d5fdbcccf
2016-11-15 17:04:37 +00:00
Neil Fuller
ef34053f26 Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38
am: 98f03f4980

Change-Id: Ia6592370da446e43896fb56d12f734841e137d49
2016-11-15 16:57:32 +00:00
Neil Fuller
98f03f4980 Merge "Correctly handle when the user has no explicit time_12_24 setting"
am: 8631e19d38

Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927
2016-11-15 16:50:29 +00:00
George Mount
687e550042 Don't update fragments if the manager's state doesn't change.
Bug 32610133

A change in behavior was introduced in which the dispatch* methods
moved the state of the manager's fragments even when the manager's
state doesn't change.

Test: I88f5a3313ad05429167c417b840f888f86fd1c11

Change-Id: Ie260b1c57fae505b2636ff7572a493a92449dff4
2016-11-15 08:43:57 -08:00
Neil Fuller
8631e19d38 Merge "Correctly handle when the user has no explicit time_12_24 setting" 2016-11-15 16:39:42 +00:00
TreeHugger Robot
5ddd7172b1 Merge "Enforce line-wrapping in DeviceAdminReceiver.java" 2016-11-15 15:28:48 +00:00
TreeHugger Robot
5962992e27 Merge "add event type enum to proto def" 2016-11-15 14:35:43 +00:00
Julia Reynolds
5b6099f3bb Merge "Remove 'until next alarm'." into nyc-mr2-dev am: fd5f6e9446
am: a167322e66

Change-Id: Ia591935f33c21a9578c201da5f342f798afa73da
2016-11-15 14:21:05 +00:00
Julia Reynolds
705727e3b0 Remove 'until next alarm'. am: 5edde5f18a
am: 177a976a69

Change-Id: Ibc7fa4b34ea4822e61c78477007cef862dfe0127
2016-11-15 14:19:52 +00:00
Julia Reynolds
5f84c1941a Volume slider should always show the proper level.
Even if the phone is in vibrate mode.

Test: manual
Change-Id: Ie5a996ac2a43920b62aac0402e597a1babf3c289
2016-11-15 14:15:35 +00:00
Julia Reynolds
a167322e66 Merge "Remove 'until next alarm'." into nyc-mr2-dev
am: fd5f6e9446

Change-Id: I9cfa68615af9415265955d62a924d8fb9ddb2d80
2016-11-15 14:13:23 +00:00
Julia Reynolds
177a976a69 Remove 'until next alarm'.
am: 5edde5f18a

Change-Id: I0f247f52155f78cefe0d2e850e9d5f1ca65dfb42
2016-11-15 14:13:18 +00:00
Diego Perez
c318f0b408 More layoutlib testing infra fixes
- Remove ModuleClassLoader as it can be replaced with a URLClassLoader
  for now.
- Move CustomCalendar and CustomDate to a separate package that can be
  used both by the Bridge tests and the actual test app.
- Move empty.xml out of the test app so it compiles.
- Update test app to use the latest build tools and SDK (some attributes
  being used by the app weren't supported in API 21).
- Update gitignore to remove the new out directory.

Test: Update to existing tests
Change-Id: Ieb7324d5ae559f9c581771c57f2127cd83909015
2016-11-15 14:11:33 +00:00
Julia Reynolds
fd5f6e9446 Merge "Remove 'until next alarm'." into nyc-mr2-dev 2016-11-15 14:06:39 +00:00
Jerome Gaillard
063f75d65b Merge "Fix testActivity on buildbot" 2016-11-15 14:00:45 +00:00
Gustav Sennton
ebd8b62cfe Merge "Dump the entire state of WebViewUpdateService on demand." 2016-11-15 12:54:01 +00:00
Akitaka Kimura
efd1c54a40 Fix Hotspot tile is shown on Guest user
Last tiles are cached in QSTileHost and they are re-used
for other users. But when the cached tile is added, QSTileHost
doesn't check whether it is available or not. So Hotspot tile
is shown on Guest user. To fix this issue, QSTileHost should
check whether the tile is available when it is added.

Bug: 32817349
Test: manual - add Hotspot tile to default tiles
               and switch to Guest user

Change-Id: I96d5876024f6d519bf72a462b5c79dcf41b253f9
2016-11-15 10:54:43 +00:00
Martijn Coenen
90213f341d Fix deprecated range_x calls.
Test: builds
Change-Id: I98412e51a54ef9f9e26c72ecd810dcea77aefdbb
2016-11-15 09:07:12 +01:00
Sunny Goyal
4f05d8d76b Preventing widgets from exceeding Bitmap memory limit
> Moving the size check to a comman place so that it is executed in
all related code
> Fixing size calculation when views are merged as a result of partial
update

Test: Manually tested with a dummy app
Bug: 31790171
Change-Id: Id0ea776796f156455d2cba31c8392d4875116949
(cherry picked from commit 349b412b4b)
2016-11-15 05:22:04 +00:00
TreeHugger Robot
199ab1f175 Merge "Use layered version of graphic buffer allocation calls." 2016-11-15 05:15:04 +00:00
Peter Qiu
50a6761195 Merge "osu: remove calls to deprecated APIs" am: e9514808d7 am: 30874ed6ed am: 0a5b88e286
am: 6966f450a2  -s ours

Change-Id: I786dfe46041dbf9c73e07b1fd20f9f720b3fbcb5
2016-11-15 04:37:56 +00:00
Peter Qiu
6966f450a2 Merge "osu: remove calls to deprecated APIs" am: e9514808d7 am: 30874ed6ed
am: 0a5b88e286

Change-Id: Ifb54b8061a70851a8989fae30466f87822e05943
2016-11-15 04:30:20 +00:00
Peter Qiu
0a5b88e286 Merge "osu: remove calls to deprecated APIs" am: e9514808d7
am: 30874ed6ed

Change-Id: I43093bf243cb249ad892bdf94ea9781ca734e239
2016-11-15 04:23:21 +00:00
Peter Qiu
30874ed6ed Merge "osu: remove calls to deprecated APIs"
am: e9514808d7

Change-Id: If7c31b7d901ef8cc8561b7f0933d803498105e75
2016-11-15 04:15:59 +00:00
Treehugger Robot
e9514808d7 Merge "osu: remove calls to deprecated APIs" 2016-11-15 03:59:57 +00:00
Svetoslav Ganov
fa2510250b Merge "Add WiFi toggle prompts - framework" into stage-aosp-master am: 9f078049cf am: 05149e69cb
am: a30eb89ead

Change-Id: If91048fb75a0d095541193d3e054d99a1304edb4
2016-11-15 03:48:59 +00:00
Svetoslav Ganov
d0d8f46a2b Add WiFi toggle prompts - framework am: 6c3032f16b am: 23328d9714
am: afb49d395e

Change-Id: I7a5a76e9220f261248607be34f63335c9fcb4b0a
2016-11-15 03:48:01 +00:00
Svetoslav Ganov
a30eb89ead Merge "Add WiFi toggle prompts - framework" into stage-aosp-master am: 9f078049cf
am: 05149e69cb

Change-Id: Ib284befe74e6bca8b3c75e5c33dec1ba23eab898
2016-11-15 03:41:14 +00:00
Svetoslav Ganov
afb49d395e Add WiFi toggle prompts - framework am: 6c3032f16b
am: 23328d9714

Change-Id: I629311080b90402a3919dcd3c7b49291800a398b
2016-11-15 03:40:16 +00:00
Sunny Goyal
d998c08231 Merge "Preventing widgets from exceeding Bitmap memory limit" 2016-11-15 03:33:46 +00:00
Svetoslav Ganov
05149e69cb Merge "Add WiFi toggle prompts - framework" into stage-aosp-master
am: 9f078049cf

Change-Id: I28501fc58e597c1f5e9d4da6bfaa3a015cad1260
2016-11-15 03:28:20 +00:00
Svetoslav Ganov
23328d9714 Add WiFi toggle prompts - framework
am: 6c3032f16b

Change-Id: Ie89a9b91b8b1cd7158a743d8b5870d8f9d6f8adc
2016-11-15 03:27:22 +00:00
Yifan Hong
4eb38841a4 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am: 8cc1343724 am: 2187dc5ca1 am: 41579ea4d4
am: 8afcb67a89

Change-Id: Ib6657958538c75814f9e5afd17c9446e3a8ff7fe
2016-11-15 03:26:51 +00:00
Yifan Hong
8afcb67a89 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am: 8cc1343724 am: 2187dc5ca1
am: 41579ea4d4

Change-Id: Ia8f41eb4c76c241088a4cce368409bd61deb5d35
2016-11-15 03:19:19 +00:00
TreeHugger Robot
9f078049cf Merge "Add WiFi toggle prompts - framework" into stage-aosp-master 2016-11-15 03:18:26 +00:00
Yifan Hong
41579ea4d4 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am: 8cc1343724
am: 2187dc5ca1

Change-Id: If0919864026c78fed76df1554235c2acca9f2750
2016-11-15 03:12:43 +00:00
Andreas Gampe
da69216ac6 Preload2: Fix dependencies
Also depend on and package tools-common.

Test: m
Test: preload-tool
Change-Id: I19a8844f87417f2292e50ffaaebb5fa24a2eca24
2016-11-14 19:08:22 -08:00
Yifan Hong
2187dc5ca1 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
am: 8cc1343724

Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109
2016-11-15 03:06:44 +00:00
Treehugger Robot
8cc1343724 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." 2016-11-15 02:59:52 +00:00
Sudheer Shanka
3052f85a1c Remove transaction ids in IApplicationThread.
No need of transaction ids here (no callers on native side).

Bug: 30977067
Test: N/A
Change-Id: I041cd721acb53f1177d8e8ea62342127431ad179
2016-11-14 18:42:24 -08:00
Svetoslav Ganov
6c3032f16b Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Original-Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Change-Id: I3fdc2b02abecaf3166614b0cb9fac3553cb7ab88
(cherry picked from commit d3663c04a7)
2016-11-14 18:34:40 -08:00
Peter Qiu
28a3d44536 osu: remove calls to deprecated APIs
The hidden APIs WifiManager#addPasspointManagmentObject and
WifiManager#addPasspointManagementObject will removed, so remove
all callsites.

The OSU app is still under developement and is not included
in any device builds.  However, it is being built by the Treehugger
for generic AOSP builds.

So fix it to allow the API removal CLs to be submitted.

Bug: 32509661
Test: None
Merged-In: Ic405695ee8edfd0c08b831834797f163fe445595
Change-Id: If418c64e69f1836575257b9d5b2f5c4373050a31
2016-11-15 02:12:57 +00:00
Fyodor Kupolov
964d2ebb94 Control privileged permissions for priv-apps
Added support for privapp-permissions config element. It allows to explicitly
control what privileged permissions applications should be granted.

Feature is controlled by ro.control_privapp_permissions property.
Possible values:
- 0/false, the feature is completely disabled - signature|privileged
  permissions are granted automatically without logging. *Default behavior*
- 1/true, enforce that only whitelisted permissions are granted. Only
  devices with ro.control_privapp_permission=1 will pass CTS tests.

Test: Manual
Bug:31008485
Change-Id: I93a8c2782cc72b3953f32c237086d08d82ac0d5b
2016-11-14 18:06:15 -08:00
Seigo Nonaka
b6e2013975 Move test only initialization to each test setup.
Global default typeface initialization is only used by test code.
It is good to do in test and remove from production.

Test: ran hwuimicro hwui_unit_tests hwuimacro
Change-Id: I7090b1794828072112540b4e357a6d24bf8f664a
2016-11-15 10:45:01 +09:00
Sudheer Shanka
ee148f921f Remove transaction ids in IActivityManager.aidl.
Bug: 30977067
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test \
          android.server.cts
      adb shell am instrument -e class \
          com.android.server.am.ActivityManagerTest,com.android.server.am.TaskStackChangedListenerTest \
          -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I44c5f756db882e0400727e44264219c873e6bd02
2016-11-14 17:40:01 -08:00
Selim Cinek
171cb036a1 Fixed a bug with the emergency affordance in multi user am: b8a7f78d24 am: 6cc0b517ba am: 96d4aadb4c
am: 23067d83d5

Change-Id: I531d9e49ca42e49ee0f9e31722748501e558e7b1
2016-11-15 01:39:25 +00:00
TreeHugger Robot
3e06ae7be2 Merge "osu: remove calls to deprecated APIs" 2016-11-15 01:35:44 +00:00
TreeHugger Robot
a2e469037e Merge "Group injected tiles together based on package name." 2016-11-15 01:34:58 +00:00
Selim Cinek
23067d83d5 Fixed a bug with the emergency affordance in multi user am: b8a7f78d24 am: 6cc0b517ba
am: 96d4aadb4c

Change-Id: I46d1527df288330d9daea3f7c843a4b80a4ec468
2016-11-15 01:32:12 +00:00