Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,840 Commits 3 Branches 0 Tags
85387e3357e00a1836ee2d1de055dda5550a1468
Commit Graph

277840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Renouf
85387e3357 Merge "Allow power button to close an input method" into cw-f-dev 
am: 33d498b946

Change-Id: I16d09e41f6804d0f5bd68b02e019a2d258c792f3
 2016-12-01 01:34:15 +00:00
Mark Renouf
8da4ced46c Allow power button to close an input method 
am: d28e907183

Change-Id: I0324d14bde85e3461d0fe605f3b83496b25b9c75
 2016-12-01 01:29:11 +00:00
Mark Renouf
33d498b946 Merge "Allow power button to close an input method" into cw-f-dev 2016-12-01 01:16:59 +00:00
Andreas Gampe
85b63db42a Merge "App_process: Clean up sanitized binaries" am: 273adb5257 
am: c07a430722

Change-Id: Ib507ba1a1abd185ed6977722f9c1cb42cf84eab0
 2016-12-01 00:20:05 +00:00
Glenn Kasten
c408777f36 Merge "LOCAL_CLANG := true is now the default" am: 1204e3806f 
am: 25889e4d6c

Change-Id: I556e40803c942626dceafc7e12278d75ef33337f
 2016-12-01 00:17:36 +00:00
Stephen Chen
6d7e85cb6b Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." am: 6e54c31f0a 
am: 6ef2ec0d80

Change-Id: I2f36c6d7dc284605b490f9793f17d713bc622063
 2016-12-01 00:09:17 +00:00
Andreas Gampe
c07a430722 Merge "App_process: Clean up sanitized binaries" 
am: 273adb5257

Change-Id: I83ec3dd0ad23844cc9ba3420bc43b9b8deb3d1ca
 2016-12-01 00:09:00 +00:00
Robert Greenwalt
32a369305c Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" am: fbb48bcecd 
am: 2b5a69cb6f

Change-Id: I62d7899969aa8fcc1d5c8e566fb41825fd85e8ee
 2016-12-01 00:08:14 +00:00
nharold
64a8a387a4 Merge "Expose GSM Timing Advance, Update LTE TA docstring" am: 4134ccb214 
am: 8fabfd639e

Change-Id: I6d69cc6ce34ed1acf1f19e760631850b2cf2446c
 2016-12-01 00:07:20 +00:00
Glenn Kasten
25889e4d6c Merge "LOCAL_CLANG := true is now the default" 
am: 1204e3806f

Change-Id: Id579bdea109bca2056cea6c0359e18b120801bf4
 2016-12-01 00:06:49 +00:00
Stephen Chen
6ef2ec0d80 Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." 
am: 6e54c31f0a

Change-Id: Ie3b4a3ed5e2858ce2b3446c300c984875201205c
 2016-12-01 00:02:58 +00:00
Robert Greenwalt
2b5a69cb6f Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" 
am: fbb48bcecd

Change-Id: I7a1c9a20e5f4f9f051926294650fcf9d486d4703
 2016-12-01 00:01:04 +00:00
Jordan Liu
0672ea446d resolve merge conflicts of a578ae2 to stage-aosp-master 
am: cee0c941ed

Change-Id: I39f3256a13117c2afe6872f58f57c18c308eab30
 2016-12-01 00:00:55 +00:00
nharold
8fabfd639e Merge "Expose GSM Timing Advance, Update LTE TA docstring" 
am: 4134ccb214

Change-Id: Ic60953cebd3209b1320ed4b6723809d0421ebc27
 2016-12-01 00:00:09 +00:00
Jordan Liu
cee0c941ed resolve merge conflicts of a578ae2 to stage-aosp-master 
Change-Id: I344ce44711edee385c64de4e6c52c64e6901820d
 2016-11-30 15:08:13 -08:00
Michael Kwan
1ff7a68fe8 Merge "Change activity dismiss animation to move left to right." into cw-f-dev 
am: d950da334e

Change-Id: Ic9900005a1a84f17c5e0831de5a6b19cf4c4798f
 2016-11-30 22:46:51 +00:00
Michael Kwan
d305b037da Change activity dismiss animation to move left to right. 
am: 6d969ea4d8

Change-Id: I977b5d74b860afd2a06695dfcc67bf1307285d5d
 2016-11-30 22:46:44 +00:00
TreeHugger Robot
d950da334e Merge "Change activity dismiss animation to move left to right." into cw-f-dev 2016-11-30 22:39:06 +00:00
vinodkrishnan
ff6ff81345 Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev 
am: a0d9383f71

Change-Id: Ib6cce473f9d39835fbaebfff00498320ea039bc8
 2016-11-30 21:55:23 +00:00
vinodkrishnan
afd52a7ad4 Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" 
am: 7b62df8556

Change-Id: I7c8d922fb125bf786990642679ebdd17ba589a54
 2016-11-30 21:52:13 +00:00
TreeHugger Robot
a0d9383f71 Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev 2016-11-30 21:43:38 +00:00
Mark Renouf
d28e907183 Allow power button to close an input method 
BUG: 33038203
Change-Id: I5c44dc49db6b960b4e3e42545bfbbab62f357f08
 2016-11-30 16:01:42 -05:00
Treehugger Robot
273adb5257 Merge "App_process: Clean up sanitized binaries" 2016-11-30 21:00:56 +00:00
Treehugger Robot
1204e3806f Merge "LOCAL_CLANG := true is now the default" 2016-11-30 20:35:41 +00:00
Treehugger Robot
6e54c31f0a Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." 2016-11-30 20:25:13 +00:00
Michael Kwan
6d969ea4d8 Change activity dismiss animation to move left to right. 
Bug: 33041168
Change-Id: Idf3d512debead3b3c70bc2bb8b38b133f2ad1723
 2016-11-30 12:19:36 -08:00
vinodkrishnan
7b62df8556 Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y" 
This reverts commit 8500f26d51.

Change-Id: I6408fa3f307d7611443e26b24d3876c1a1f92fdc
 2016-11-30 20:09:59 +00:00
Robert Greenwalt
fbb48bcecd Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" 2016-11-30 19:47:23 +00:00
nharold
4134ccb214 Merge "Expose GSM Timing Advance, Update LTE TA docstring" 2016-11-30 18:00:35 +00:00
Andreas Gampe
622f511f2f App_process: Clean up sanitized binaries 
Clean up the definition of sanitized binaries. Clean up the
Android.mk to share values.

Bug: 33224213
Test: mmma SANITIZE_TARGET=address SANITIZE_LITE=true frameworks/base/cmds/app_process && ls $OUT/system/bin/asan
Change-Id: I70f8d95ff2ec6366fc0a7d252b91dce268186910
 2016-11-30 09:46:09 -08:00
Jordan Liu
a578ae2aa1 Merge "Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY" 2016-11-30 17:42:31 +00:00
Glenn Kasten
827d0d76fb LOCAL_CLANG := true is now the default 
Change-Id: I2f6a8c7f32cbf682c968a43d590d773ffb21e909
(cherry picked from commit 3a7510bcf6)
 2016-11-30 09:42:23 -08:00
Etan Cohen
1c92763087 Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad 
am: ad299d38ff

Change-Id: I9834f0e2687685a52970ab406a411217cc2eeec9
 2016-11-30 17:14:14 +00:00
Etan Cohen
ad299d38ff Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" 
am: 47502919ad

Change-Id: If8f7d8e0e039d2d9961de84e5aa8693448b77a26
 2016-11-30 17:08:32 +00:00
Etan Cohen
47502919ad Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" 2016-11-30 16:58:08 +00:00
Etan Cohen
1ddf6a6d3a [AWARE] Data-path creation roles hard-coded for discovery sessions 
Data-path roles (initiator & responder) are hard-coded for discovery
session participants by the spec: subscriber <-> initiator and
publisher <-> responder. Remove API parameter which allowed caller
to specify role.

(cherry-pick of commit 9c7483fec41db681a2d6de93a9061fb8764ecba5)

Bug: 32883026
Test: unit-tests and integration (sl4a) tests passing.
Change-Id: I889eacda9416d9ecd04caa0c72413f984611d40c
 2016-11-30 07:10:42 -08:00
Paul Duffin
783096f02c Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f 
am: a485fa1fce

Change-Id: I578b109bc0a4f8655643dad1092b46296ff18114
 2016-11-30 12:20:11 +00:00
Paul Duffin
a485fa1fce Merge "Add legacy-test as replacement for core-junit" 
am: e75a82a92f

Change-Id: Ifa6b4d9c968878e956ddff71a607af67a84472e6
 2016-11-30 12:15:14 +00:00
Paul Duffin
e75a82a92f Merge "Add legacy-test as replacement for core-junit" 2016-11-30 12:04:23 +00:00
Mark Lu
e5a3ad23fd Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc 
am: 15df815e1e

Change-Id: I51d74fee535d916c1c160d5e1fb68c350e6e4ef7
 2016-11-30 09:19:26 +00:00
Mark Lu
15df815e1e Merge "Fix batterySendBroadcast not synchronized issue." 
am: 32e756a4bc

Change-Id: Ieab665e92bdb17c449c82de66604fbef5688de17
 2016-11-30 09:14:31 +00:00
Treehugger Robot
32e756a4bc Merge "Fix batterySendBroadcast not synchronized issue." 2016-11-30 07:59:55 +00:00
Anthony Hugh
f3eef9a286 Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev 
am: 75bf81458e

Change-Id: I82abdf00c00d2a735e6723d8a175f152be982aff
 2016-11-30 03:28:44 +00:00
Anthony Hugh
32a0b7351e DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback 
am: f73d085395

Change-Id: I6d17a74e4030e20b7a08516d0b4ec90e31930c66
 2016-11-30 03:28:37 +00:00
TreeHugger Robot
75bf81458e Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev 2016-11-30 03:09:24 +00:00
Andreas Gampe
04cbf97d38 Merge "Preload2: Add sequence UI" am: 56ddac7fd7 
am: b9d8535a21

Change-Id: I721674c8381caa9c404c3708122f03d6c8d6d204
 2016-11-30 00:59:23 +00:00
Andreas Gampe
b9d8535a21 Merge "Preload2: Add sequence UI" 
am: 56ddac7fd7

Change-Id: I6ca6e1ea6c6721a24f7b1d3d7fb4715bd51aa0d9
 2016-11-30 00:49:44 +00:00
Treehugger Robot
56ddac7fd7 Merge "Preload2: Add sequence UI" 2016-11-30 00:39:19 +00:00
Anthony Hugh
f73d085395 DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback 
It looks like there was a regression where #onNewIntent() was called
before the FLAG_ACTIVITY_BROUGHT_TO_FRONT flag was set.  This
change updates the code so we set the flag properly.

BUG: 33034247
Change-Id: I61959a289dc5af14ee9d3d7bfa213191238efc88
 2016-11-30 00:00:15 +00:00
Andreas Gampe
437474990d Preload2: Add sequence UI 
Add a fake UI that can run a sequence of actions (and replies).

Bug: 31961946
Test: manual
Change-Id: Iee0fac5ddf75a97eff7b401c9c932634489349de
 2016-11-29 15:22:02 -08:00