Amit Mahajan
9608d1c247
Merge "Changing default value of config_use_sim_language_file to false." into nyc-mr1-dev
...
am: 8c16969c3e
2016-08-24 22:11:36 +00:00
Amit Mahajan
dddb5e3f8f
Changing default value of config_use_sim_language_file to false.
...
am: 2b2f728f28
2016-08-24 22:11:33 +00:00
Suprabh Shukla
fd0bd4f39d
Resolving race condition while writing recent taskids
...
There was a race condition, due to which, by the time
TaskPersister started writing the taskids to the file,
the user was stopped and its data from memory was unloaded,
resulting in a NullPointerException
Bug: 30944155
Change-Id: Iac3333b7744241c90a7769686983e3f16e6880c1
2016-08-24 15:09:09 -07:00
TreeHugger Robot
8c16969c3e
Merge "Changing default value of config_use_sim_language_file to false." into nyc-mr1-dev
2016-08-24 22:03:13 +00:00
Svetoslav Ganov
66fbf7975c
Merge "Use correct UID checks and proper database lookup" into nyc-mr1-dev
...
am: d9bc0f474c
2016-08-24 22:00:26 +00:00
Svetoslav Ganov
dc33730c05
Use correct UID checks and proper database lookup
...
am: 7ee37f48dc
2016-08-24 22:00:24 +00:00
Svetoslav Ganov
d9bc0f474c
Merge "Use correct UID checks and proper database lookup" into nyc-mr1-dev
2016-08-24 21:57:17 +00:00
Svetoslav Ganov
7ee37f48dc
Use correct UID checks and proper database lookup
...
bug:31056110
bug:31050549
bug:28163381
Change-Id: I726645ae0d2456a5b4d38005fe78523332758842
2016-08-24 14:53:18 -07:00
Makoto Onuki
0a15cd4ba0
Backport shortcut manager test utilities to DR
...
Bug 29612099
Bug 31033599
Change-Id: I59d4ae61fdb2245797f2d8e39beddc3b66b93fe6
2016-08-24 14:38:23 -07:00
Ned Burns
68efd087a3
Merge "Focus behavior for scroll containers in watch mode" into cw-f-dev
2016-08-24 21:11:45 +00:00
Makoto Onuki
fc4cf2da34
Shortcut: Improve backup & restore
...
* Catch RuntimeException from restore, in case restoring from a
partner device with an incompatible file format.
* When a restore target app is already installed, and
- if it has allowBackup=true, we'll restore normally, so all
existing shortcuts will be replaced. (but manifest shortcuts
will be re-published anyway.) We log a warning on logcat.
- if it has allowBackup=false, we don't touch any of the
existing shortcuts.
Bug 31057974
Bug 30766177
Change-Id: Ic3f7e860e7ea0d086fc589d8cbed8c4cebdd4bc6
2016-08-24 13:52:02 -07:00
David Christie
6195acc2b5
resolve merge conflicts of a2399b4 to mnc-dev
...
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
2016-08-24 13:47:57 -07:00
Adrian Roos
190e532c86
DirectReply: Fix bugs when replying from HUNs
...
Fixes a bug that would re-open the remote input when
it was sent while HUN'd. Also fixes a bug that would
not properly clear a notification if swiped away and
at the same time HUN'd and having a reply active.
Change-Id: I3e8b5f81eaffd8e4b8602f3dbdd025229ba201fa
Fixes: 30454772
2016-08-24 20:41:19 +00:00
Sudheer Shanka
cdf70ba0a3
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944
...
am: a0994c6d58
2016-08-24 20:38:40 +00:00
Sudheer Shanka
dfc2d0a4bc
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06
...
am: f21534a288
2016-08-24 20:38:30 +00:00
Amith Yamasani
7b8140652b
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986
...
am: 03b0f5c3ec
2016-08-24 20:38:20 +00:00
Sudheer Shanka
26bb7bf86c
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7
...
am: c8aedeeaf6
2016-08-24 20:38:16 +00:00
Jack Yu
f7b93f30ba
Merge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev
...
am: edaaef304a
2016-08-24 20:38:15 +00:00
Amith Yamasani
117a383099
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf
...
am: dd0be992c0
2016-08-24 20:38:12 +00:00
Jack Yu
d330f0ccc4
Do not print misleading debug messages in some scenarios.
...
am: bfd1d6ed49
2016-08-24 20:38:12 +00:00
Adrian Roos
9550f2e75c
DirectReply: Fix bugs when replying from HUNs
...
Fixes a bug that would re-open the remote input when
it was sent while HUN'd. Also fixes a bug that would
not properly clear a notification if swiped away and
at the same time HUN'd and having a reply active.
Change-Id: I3e8b5f81eaffd8e4b8602f3dbdd025229ba201fa
Fixes: 30454772
2016-08-24 13:35:15 -07:00
Narayan Kamath
5191225400
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67 am: 86437ec433
...
am: 4d7740907e
2016-08-24 20:30:21 +00:00
Narayan Kamath
c11e8fcc04
Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours am: 2984748753 am: b9fae65605
...
am: c6c7ca0cde
2016-08-24 20:30:13 +00:00
Narayan Kamath
c6ab92e93b
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f
...
am: 3c63bb367f
2016-08-24 20:30:09 +00:00
David Christie
af369f6e66
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30
...
am: 8788a2413c
2016-08-24 20:30:06 +00:00
David Christie
975879a18d
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
...
am: 41a0dd41f1
2016-08-24 20:30:01 +00:00
Jack Yu
edaaef304a
Merge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev
2016-08-24 20:24:42 +00:00
Steve McKay
b9b65370b7
Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev
...
am: 850912db88
2016-08-24 19:55:25 +00:00
Steve McKay
89eb830a73
DO NOT MERGE: Don't create DocumentInfo instances in background.
...
am: b818058f4e
2016-08-24 19:55:22 +00:00
TreeHugger Robot
850912db88
Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev
2016-08-24 19:49:36 +00:00
Guang Zhu
d8ac1dd3ed
use threadtime when collecting logcat
...
Bug: 31048686
Test: make droid
Change-Id: I55cd38b9cdc4224fcd319af706d421cdac062f83
2016-08-24 18:52:37 +00:00
Amit Mahajan
2b2f728f28
Changing default value of config_use_sim_language_file to false.
...
Bug: 30150341
Change-Id: If0183ce0bfa4f872d991e5aed562eeb948ed86c8
2016-08-24 11:45:35 -07:00
Salvador Martinez
347f0c6612
Merge "Added error handling to settings suggestions list" into nyc-dev am: ed004e2958 am: e9c519e049
...
am: e8e7f1b88a
2016-08-24 18:40:05 +00:00
Salvador Martinez
b14e30fc84
Added error handling to settings suggestions list am: 18bf581c77 am: 2cb851e5c9
...
am: cfa4ad4e1e
2016-08-24 18:40:02 +00:00
Alan Viverette
352ccc9f84
Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev
...
am: 709f0f3e15
2016-08-24 18:34:28 +00:00
Alan Viverette
3deb906397
Ensure the layer drawable callback is set when loading from theme
...
am: 11a84b8429
2016-08-24 18:34:26 +00:00
Alan Viverette
56d8f4e2b4
Merge "Improve docs for GradientDrawable's useLevel and centerX/Y properties" into nyc-mr1-dev
...
am: 20109a689d
2016-08-24 18:33:58 +00:00
Alan Viverette
cc914b6b0b
Improve docs for GradientDrawable's useLevel and centerX/Y properties
...
am: daec5506c4
2016-08-24 18:32:55 +00:00
Salvador Martinez
e8e7f1b88a
Merge "Added error handling to settings suggestions list" into nyc-dev am: ed004e2958
...
am: e9c519e049
2016-08-24 18:32:11 +00:00
Salvador Martinez
cfa4ad4e1e
Added error handling to settings suggestions list am: 18bf581c77
...
am: 2cb851e5c9
2016-08-24 18:32:09 +00:00
Alan Viverette
040e5d8ce3
Merge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev
...
am: 16b8941dba
2016-08-24 18:32:07 +00:00
Alan Viverette
9af5e5b31b
Clean up VideoView, SurfaceView constructors
...
am: 768ca7d19b
2016-08-24 18:31:38 +00:00
Alan Viverette
31be04fddd
Merge "Constrain input hour and minute to valid range" into nyc-mr1-dev
...
am: 4e32b47c48
2016-08-24 18:31:11 +00:00
Alan Viverette
a2c9a8c274
Constrain input hour and minute to valid range
...
am: f0ac2ba9f4
2016-08-24 18:30:20 +00:00
Alan Viverette
3bc48eec3d
Merge "Override LinearLayout's onLayout pass in AlertDialogLayout" into nyc-mr1-dev
...
am: 52306705c1
2016-08-24 18:29:18 +00:00
Alan Viverette
ab508dd52b
Override LinearLayout's onLayout pass in AlertDialogLayout
...
am: 1bb8f51e76
2016-08-24 18:28:40 +00:00
Salvador Martinez
e9c519e049
Merge "Added error handling to settings suggestions list" into nyc-dev
...
am: ed004e2958
2016-08-24 18:28:00 +00:00
Salvador Martinez
2cb851e5c9
Added error handling to settings suggestions list
...
am: 18bf581c77
2016-08-24 18:27:56 +00:00
Salvador Martinez
ed004e2958
Merge "Added error handling to settings suggestions list" into nyc-dev
2016-08-24 18:17:40 +00:00
Alan Viverette
709f0f3e15
Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev
2016-08-24 18:17:04 +00:00
