Commit Graph

305621 Commits

Author SHA1 Message Date
Jean-Michel Trivi
6deaa4c8cf Merge "Notification playback synchronized with audio focus" 2017-02-01 18:43:36 +00:00
Nimrod Gileadi
24e602a99b Merge "Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52" into nyc-mr2-dev-plus-aosp
am: da5289b6ed

Change-Id: I34d2a4a3945579820af1c3fdb04da53b956bf665
2017-02-01 18:10:07 +00:00
Nimrod Gileadi
ba5f6308e0 Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52
am: 0dea9e896f

Change-Id: I69418d80868e6cb27fcc82635150c47da03c3654
2017-02-01 18:10:00 +00:00
Nimrod Gileadi
2dac5c7212 Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: 9576ce6696
am: 00620e70d5

Change-Id: Ie9e186901a6d846ee1417b1b1db9ed091e854b89
2017-02-01 18:08:49 +00:00
Android Build Merger (Role)
da5289b6ed Merge "Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52" into nyc-mr2-dev-plus-aosp 2017-02-01 18:03:11 +00:00
Sergei Vasilinetc
40c509ff0f Merge "Call ActivityCallbacks after corresponding activity methods" 2017-02-01 18:02:34 +00:00
Nimrod Gileadi
0dea9e896f Add Wear keycodes to emulator key layout file. am: 119a06ce55
am: c85e503d52

Change-Id: I6840265835199d454d735e443fb53228c0ae2fd2
2017-02-01 18:02:17 +00:00
Nimrod Gileadi
00620e70d5 Add Wear keycodes to emulator key layout file. am: 119a06ce55
am: 9576ce6696

Change-Id: Ic10c9e353a264c60cef3dac79a2fc4b57eebb244
2017-02-01 18:01:45 +00:00
Nimrod Gileadi
9576ce6696 Add Wear keycodes to emulator key layout file.
am: 119a06ce55

Change-Id: I33d2b0f9b8281c22422677f03d6046a1be0bd94f
2017-02-01 17:57:16 +00:00
Nimrod Gileadi
c85e503d52 Add Wear keycodes to emulator key layout file.
am: 119a06ce55

Change-Id: Ieb06380c3bd43af7087463543960cc4ee1889050
2017-02-01 17:57:11 +00:00
Bryce Lee
a99952c18d Merge "Revert "Allow opening activity to specify orientation."" 2017-02-01 17:11:34 +00:00
Bryce Lee
2fb7de3d51 Revert "Allow opening activity to specify orientation."
This reverts commit f0a6fdbf53.

Reason for revert: Submitted before complete.

Change-Id: I545ff45b5e870c79d66884b7a2a80981293b1b24
2017-02-01 17:09:18 +00:00
Bryce Lee
26dbff358c Merge "Allow opening activity to specify orientation." 2017-02-01 17:06:13 +00:00
TreeHugger Robot
451911ea3a Merge "Remove setDockedStackMinimized credentials prompt" 2017-02-01 16:42:24 +00:00
Yohei Yukawa
73e3d1772c Merge "Fix a wrong UID can be logged" 2017-02-01 16:00:14 +00:00
TreeHugger Robot
5c34fa8ae7 Merge "Initialize bootanimation sound on separate thread" 2017-02-01 15:46:01 +00:00
Bryan Mawhinney
a5d2e18d95 Merge "Blacklist more settings from backup" 2017-02-01 15:25:59 +00:00
Robin Lee
4403f2fe17 Remove setDockedStackMinimized credentials prompt
Reverts functional parts of commit 853304c0b1

This lives in a TaskStackListener now, so we just start the prompt for
activity stacks that need it, not for the whole device at once.

Bug: 31001762
Test: make -j20 && Boot, `adb shell service call trust 6 i32 {userid} i32 1`, resize docked stack.
Change-Id: I58be5174e10779f01149de1cd5c2a4db00b98490
2017-02-01 14:32:15 +00:00
Bryan Mawhinney
9a471b9441 Blacklist more settings from backup
Test: run FrameworksCoreTest
Change-Id: I1b24ee1bcdae7e0d880bdc7f69dba6be07e72f1e
2017-02-01 13:18:27 +00:00
Nimrod Gileadi
119a06ce55 Add Wear keycodes to emulator key layout file.
The SLEEP keycode is used by Android Wear to indicate a
"palming" gesture (covering the screen with one's hand).

The STEM_* buttons are used for side buttons on Wear.

The keycode values were added to the emulator in
http://r.android.com/330771

Bug: 19996432
Change-Id: Ib90c3b27209b0059ebc1c2cce46cc732a677d557
2017-02-01 12:13:12 +00:00
Abodunrinwa Toki
8e332cc54b Merge "Ignore smart selection for multi-word selections." 2017-02-01 10:51:06 +00:00
Bryan Mawhinney
5668955ecd Merge "Blacklist some new settings from backup" 2017-02-01 10:18:24 +00:00
TreeHugger Robot
07072e1c9f Merge "Add an API hint for metered multipath traffic." 2017-02-01 09:54:21 +00:00
TreeHugger Robot
97fe63bb53 Merge "Revert "Push mapping from file extension to GID."" 2017-02-01 08:56:55 +00:00
TreeHugger Robot
9f864522af Merge "Camera2: Check for valid GPS timestamp before usage" 2017-02-01 08:18:07 +00:00
Lorenzo Colitti
2de4925f5c Add an API hint for metered multipath traffic.
This allows an application that knows how to provide seamless
network connectivity (e.g., using QUIC multipath) to find out if
doing so is desired.

Test: builds, boots, runtest frameworks-net passes.
Bug: 34630278
Change-Id: Ic7fd0b9e1cd879fdfaf84009d7125391895e9087
2017-02-01 17:02:29 +09:00
Keisuke Kuroyanagi
c20c33f53e Merge "Make TextViewActivityTest stable" 2017-02-01 07:33:49 +00:00
George Burgess IV
a9f38ec07d Merge "Fix a use-of-uninitialized-value warning" am: 53873df5fe am: aea873ade0 am: 820768f034
am: 142eacb409

Change-Id: I70591669041f2eb723ea8b18ce2cad28033872b0
2017-02-01 07:32:25 +00:00
George Burgess IV
142eacb409 Merge "Fix a use-of-uninitialized-value warning" am: 53873df5fe am: aea873ade0
am: 820768f034

Change-Id: Id9b31425cb8ba05687ff7dfa392b230865ec18e5
2017-02-01 07:27:15 +00:00
George Burgess IV
820768f034 Merge "Fix a use-of-uninitialized-value warning" am: 53873df5fe
am: aea873ade0

Change-Id: I747d94158c8a1c77f8ae1076c93a3d22f6c22ef5
2017-02-01 07:21:51 +00:00
George Burgess IV
aea873ade0 Merge "Fix a use-of-uninitialized-value warning"
am: 53873df5fe

Change-Id: I102fb345244f922cb41a5ce31b2de0af8e68bf97
2017-02-01 07:15:00 +00:00
Treehugger Robot
53873df5fe Merge "Fix a use-of-uninitialized-value warning" 2017-02-01 07:09:51 +00:00
Yohei Yukawa
59377cab5c Fix a wrong UID can be logged
This is a prepartion for fixing Bug 34838583

Currently Binder.clearCallingIdentity() is called too early, which
ends up always blaming the system UID when calledWithValidToken()
fails in InputMethodManagerService#updateStatusIcon().

Test: Compile
Bug: 34838583
Change-Id: Id69da24de8269c0c7e31ea9ef3c595c3d69fe40e
2017-01-31 21:34:09 -08:00
Pierre Lecesne
df7278d842 Merge "Moving the LoadedApk class to its own file." 2017-02-01 05:30:18 +00:00
Justin Klaassen
16e04ad40a Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev am: 42dfcc772b
am: c21a98dee0

Change-Id: Ia21d10601651123326fba5944e39f52e42c7c746
2017-02-01 05:27:43 +00:00
Justin Klaassen
6594a07c76 Enable SMS in carrier demo mode am: f8a10959d2
am: d9a1ed0cfb

Change-Id: I2ea950f526f3fbf4e4de7deae930de0a87180cc8
2017-02-01 05:26:37 +00:00
Justin Klaassen
c21a98dee0 Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev
am: 42dfcc772b

Change-Id: I8d36badab79c40e5a65a88ca4ed418409cd17e24
2017-02-01 05:21:01 +00:00
Justin Klaassen
d9a1ed0cfb Enable SMS in carrier demo mode
am: f8a10959d2

Change-Id: Icc96ba3c6fafa5df0327297ed81f8c8dff8818fe
2017-02-01 05:20:56 +00:00
TreeHugger Robot
42dfcc772b Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev 2017-02-01 05:14:02 +00:00
TreeHugger Robot
f246bea957 Merge "Remove unnecessary Binder.clearCallingIdentity()" 2017-02-01 05:10:32 +00:00
Doris Liu
741ec3ed1d Merge "Make sure start() is called for custom animators" 2017-02-01 04:33:29 +00:00
Peter Qiu
bc7858b56b Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad am: 9e7725040b am: ec61beaa7a
am: 3e6c9c9462

Change-Id: I1f345852ec2ea536e02caabd81818fa16d4c0dc7
2017-02-01 03:46:58 +00:00
Justin Klaassen
f8a10959d2 Enable SMS in carrier demo mode
Fixes: 34861667
Test: manually verified default SMS app works in carrier demo mode.
Change-Id: Ic6f1065954e5bb54c6b78b3d604811333f6863e4
2017-01-31 19:40:40 -08:00
Jeremy Joslin
16bbb0cd64 Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08dae am: 9c245a51f7
am: 499f1f39ff

Change-Id: I873b8c6239bb7766ac1a4b4078afb3700000186b
2017-02-01 03:39:57 +00:00
Peter Qiu
0636791424 Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191 am: 28630218cc
am: ebafa7c813

Change-Id: I0bc0326e3ff67fff697f1aea004806978c4244b3
2017-02-01 03:38:07 +00:00
Peter Qiu
3e6c9c9462 Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad am: 9e7725040b
am: ec61beaa7a

Change-Id: I26269af9bf18789ce40858df0645e17867f44469
2017-02-01 03:37:58 +00:00
Jeremy Joslin
499f1f39ff Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08dae
am: 9c245a51f7

Change-Id: I33a60ce4525561705572ebaa0fe1851d46c24b63
2017-02-01 03:32:27 +00:00
Peter Qiu
ebafa7c813 Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191
am: 28630218cc

Change-Id: I264d4664bc9e69d9c70dce7ffcf75e3ae2e2e430
2017-02-01 03:30:58 +00:00
Peter Qiu
ec61beaa7a Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad
am: 9e7725040b

Change-Id: I5b36bb042933a0a889b7f84281b174a7527ccaff
2017-02-01 03:30:51 +00:00
Jeremy Joslin
9c245a51f7 Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1
am: ba4bc08dae

Change-Id: I3f7e2a6ecdbe04fad0358fadecdeb8341baa99eb
2017-02-01 03:25:47 +00:00