drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
278,079 Commits 1 Branch 0 Tags
Commit Graph

278079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Rosenfeld
3711f2f0c2 Merge "Add command line action sequencing." 
am: 880c9acf4a

Change-Id: I81b31d950e0dca525fbfe9aa38c9c113eea7cec8
 2016-12-01 21:40:06 +00:00
Etan Cohen
7f12aa5470 Merge "AWARE: Abstract structure of match filters" 
am: f358a69cba

Change-Id: Ic7e87e47e9a9beebb11aa7465e4d2be9dd3e767a
 2016-12-01 21:35:05 +00:00
ltrochtova
0a21ba22e3 Merge "Introduce a new user restriction for disallowing Bluetooth." 
am: 1e9a5eac92  -s ours

Change-Id: I35d19d46b8edbacb66613e11a398c742f9d37029
 2016-12-01 21:31:23 +00:00
ltrochtova
4eb075e89f Merge "Revert "Introduce a new user restriction for disallowing Bluetooth."" 2016-12-01 21:20:43 +00:00
ltrochtova
8874fcf97f Revert "Introduce a new user restriction for disallowing Bluetooth." 
This reverts commit 69f9d321ac19e7137e07b411779339f9973eba1b.

Change-Id: I5859b262a741d1fe8e8b61e142eecf7d742d8d41
 2016-12-01 20:50:53 +00:00
Zoran Jovanovic
67f579be19 Get the correct operator name 
If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Test: ServiceStateTrackerTest.java exteneded in partner cl
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
 2016-12-01 10:36:21 -08:00
Treehugger Robot
880c9acf4a Merge "Add command line action sequencing." 2016-12-01 17:23:37 +00:00
Etan Cohen
f358a69cba Merge "AWARE: Abstract structure of match filters" 2016-12-01 15:42:35 +00:00
ltrochtova
1e9a5eac92 Merge "Introduce a new user restriction for disallowing Bluetooth." 2016-12-01 13:40:29 +00:00
Lenka Trochtova
69f9d321ac Introduce a new user restriction for disallowing Bluetooth. 
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on
the  entire device - i.e. in all the users.

Test: cts-tradefed run cts -m  CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m  CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Change-Id: Iae77647b1e48be6b8efbeccdff6a3d468a0e174d
 2016-12-01 10:56:51 +01:00
Stephen Chen
99bd27f7ee Merge "Add meteredOverride field to WifiConfiguration." am: f9479fe639 
am: dfd9942a31

Change-Id: Ia14b87efb46acf8ad8c4ad7921fdefdceb185f86
 2016-12-01 03:29:00 +00:00
Stephen Chen
dfd9942a31 Merge "Add meteredOverride field to WifiConfiguration." 
am: f9479fe639

Change-Id: I0d2540cf0a360f07c1dd103191fd348602099ff5
 2016-12-01 03:23:32 +00:00
Treehugger Robot
f9479fe639 Merge "Add meteredOverride field to WifiConfiguration." 2016-12-01 03:08:44 +00:00
Andreas Gampe
1c82020e2a Merge "App_process: Merge app_process and app_process__asan" am: de32925ccd 
am: 0662cd5de8

Change-Id: I6df03a4573610d600a037b52635414bc600772e0
 2016-12-01 02:59:01 +00:00
Michael Kwan
f89f023fe9 Merge "Change exit animation to use normal z-order." into cw-f-dev 
am: 6abcefd350

Change-Id: I451251a4e1d579dfc10ab3ddaf4bdd5ee02e2372
 2016-12-01 02:53:10 +00:00
Michael Kwan
8370c48c8d Change exit animation to use normal z-order. 
am: a562fe4a23

Change-Id: Ib0ed1f600bb55e792eb31f28f275cd3717a9c454
 2016-12-01 02:53:04 +00:00
Andreas Gampe
0662cd5de8 Merge "App_process: Merge app_process and app_process__asan" 
am: de32925ccd

Change-Id: I86aaea459fdc1283a3b7e2f0b035ad26aef98920
 2016-12-01 02:48:18 +00:00
TreeHugger Robot
6abcefd350 Merge "Change exit animation to use normal z-order." into cw-f-dev 2016-12-01 02:43:35 +00:00
Treehugger Robot
de32925ccd Merge "App_process: Merge app_process and app_process__asan" 2016-12-01 02:38:29 +00:00
Amin Shaikh
d136025272 Merge "Refactor NetworkScoreAppManager for testing." am: 3af97482f1 
am: a8fc97d2de

Change-Id: I34ed2f31eaa1336990c941ee63eea0c1ddbc305c
 2016-12-01 02:21:03 +00:00
Amin Shaikh
a8fc97d2de Merge "Refactor NetworkScoreAppManager for testing." 
am: 3af97482f1

Change-Id: I99537b7841021704c162db6b8fe3d472ede1e991
 2016-12-01 02:10:55 +00:00
Treehugger Robot
3af97482f1 Merge "Refactor NetworkScoreAppManager for testing." 2016-12-01 01:59:14 +00:00
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
Jaekyun Seok
377878b4d4 Remove static link in Android framework under /frameworks/base. 
The dependencies to static libraries in frameworks should be removed
as many as possible to reduce a size of the system partition.
And that will improve coverage of the VNDK libraries because this
effort might find new necessary shared libs which were linked
statically before.

Size diffs of libs in /system/lib on angler-userdebug build are as
following.

libandroidfw.so      : 243748 -> 205196 (-38552)
libhwui.so           : 562028 -> 562580 (+552)
libmedia_jni.so      : 293652 -> 293656 (+4)
(All the others have the same size.)

total: (-37996)

Test: building succeeded, and the image was tested on angler.
Bug: 33056637
Change-Id: I3021fb438778eaea2be935b990ec85c4aec6c008
(cherry picked from commit 2b14c5eaf61635d1c3a69a2e59faa23cb6b7f7cb)
 2016-12-01 10:31:12 +09: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
Michael Kwan
a562fe4a23 Change exit animation to use normal z-order. 
Bug: 33198426
Change-Id: I57f2f6360c165fbea25adf9b43f052e09261364b
 2016-11-30 17:17:41 -08: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
Etan Cohen
1857b982c3 AWARE: Abstract structure of match filters 
Replace byte[] representation with a List<byte[]> representation
which abstracts the LV (TLV without a type field) structure of
the match filters.

Tlv utilities: remove tag indicating that will be made public API.
That is no longer expected (will be an internal utility) since the
match filter structure is now parsed when exposed to API.

Lv utilities: removed. Was a simple wrapper around Tlv utilities -
no longer needed since will not be exposed as API.

(cherry-pick of commit c9870d0d431471bf1362e46fc4f2f1bc6722896a)

Bug: 32840891
Test: unit-tests and integration (sl4a) tests passing
Change-Id: I6d792c4d7584ce002f6c11692e83e7654ef3e764
 2016-11-30 17:01:52 -08:00
Andreas Gampe
2200e09736 App_process: Merge app_process and app_process__asan 
Two birds with one stone: simplify the setup (including the modules
required in PRODUCT_PACKAGES) and work around a build system issue
wrt/ sanitized static libraries.

Bug: 33224213
Test: mmma frameworks/base/cmds/app_process && \
      mmma SANITIZE_TARGET=address SANITIZE_LITE=true \
      frameworks/base/cmds/app_process && \
      ls $OUT/system/bin/asanwrapper && \
      readelf -s $OUT/system/bin/app_process32 | grep asan && \
      readelf -s $OUT/system/bin/asan/app_process32 | grep asan && \

Change-Id: Ieff0ea9a2209cf74cf06f813087b55cb0bcc3896
 2016-11-30 16:35:32 -08: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
Amin Shaikh
aa09aa0210 Refactor NetworkScoreAppManager for testing. 
Test: runtest frameworks-services && runtest frameworks-core
Change-Id: Ie2172009e9ba0438050488fe0aea6408f852c2c2
 2016-11-30 13:52:43 -08: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