Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
283,052 Commits 3 Branches 0 Tags
0eea1cf702173d3236a0fed2f65d7fcd5c641c8a
Commit Graph

283052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Whyte
0eea1cf702 Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am: 50fa8ad424 
am: 95f418cc52

Change-Id: I5baa412f0a080626ccdd0d087809f8d30ef511ab
 2017-02-06 23:07:16 +00:00
Ying Wai (Daniel) Fan
639236265e Prevent division-by-zero error when calculating battery capacity. am: 415f8b32e8 
am: b87f8900ce

Change-Id: I460d08b7c28a180584cf855e5e5220c6596d8a77
 2017-02-06 23:06:19 +00:00
Aaron Whyte
938e80be1e Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am: 50fa8ad424 
am: 567cfb01b4

Change-Id: I132c3018587e4c2b5766b53c1536494ce1e39f89
 2017-02-06 23:02:58 +00:00
Ying Wai (Daniel) Fan
df6a737108 Prevent division-by-zero error when calculating battery capacity. am: 415f8b32e8 
am: 63f3dbae3c

Change-Id: I1c97aa2e4c0bbc84c547e4ce3ff98b77c5bba3f4
 2017-02-06 23:02:08 +00:00
Aaron Whyte
95f418cc52 Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev 
am: 50fa8ad424

Change-Id: Ic5235c90571dc90411570fb16e9003a89e79c183
 2017-02-06 23:00:39 +00:00
Ying Wai (Daniel) Fan
b87f8900ce Prevent division-by-zero error when calculating battery capacity. 
am: 415f8b32e8

Change-Id: Ie58c329fa0814111291922b9a669ca181d4a487f
 2017-02-06 23:00:35 +00:00
Aaron Whyte
567cfb01b4 Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev 
am: 50fa8ad424

Change-Id: I3306d389c19a42130bda31cb61bc846207b76c35
 2017-02-06 22:57:30 +00:00
Ying Wai (Daniel) Fan
63f3dbae3c Prevent division-by-zero error when calculating battery capacity. 
am: 415f8b32e8

Change-Id: I1337db6391a9511df52560e8edb8a09260e27c5f
 2017-02-06 22:57:23 +00:00
Aaron Whyte
50fa8ad424 Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev 2017-02-06 22:49:35 +00:00
Manu Cornet
ebe26f89e5 Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev 
am: 925d862656

Change-Id: I93191bfb1d833134d8afd826c18b0310c7e9c46c
 2017-02-06 22:47:34 +00:00
Manu Cornet
8e08d0e828 2D Recents: use correct layout logic for drawing transition headers 
am: de3cfb0c1f

Change-Id: I46c45fed648858212a31e477f46ad25475b0710a
 2017-02-06 22:47:28 +00:00
Manu Cornet
925d862656 Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev 2017-02-06 22:38:34 +00:00
Brad Ebinger
4ad1b7bd1e Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." am: ed839943e0 am: b9f4a2d6c1 
am: 661689ffb1

Change-Id: I2ce1c8504b50b3466853c1102114ed1b0fe03dc1
 2017-02-06 22:20:02 +00:00
Brad Ebinger
661689ffb1 Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." am: ed839943e0 
am: b9f4a2d6c1

Change-Id: I0b1850f074b1a014277c485b1ee6b5b5577fb9cd
 2017-02-06 22:15:07 +00:00
Brad Ebinger
b9f4a2d6c1 Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." 
am: ed839943e0

Change-Id: Ib8ed5dbf927300503aba1d97af25703b380c56a4
 2017-02-06 22:10:26 +00:00
Brad Ebinger
ed839943e0 Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." 2017-02-06 22:03:29 +00:00
Paul Lawrence
6f594b810f Merge "Expand whitelist" am: 006065fee4 am: bff26f4bf1 
am: 21b2ab9e11

Change-Id: Id6d1e209a677c0a769b7f63744a8471eb8602a7a
 2017-02-06 21:01:55 +00:00
Android Build Merger (Role)
1395e1c88a Merge "Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae584ba am: b06c3ed79e am: 27e4cb2e61" into nyc-mr2-dev-plus-aosp 2017-02-06 20:57:35 +00:00
Paul Lawrence
21b2ab9e11 Merge "Expand whitelist" am: 006065fee4 
am: bff26f4bf1

Change-Id: I2ad973c64c858b11628348965e9593f9f85c6dbe
 2017-02-06 20:57:23 +00:00
Android Build Merger (Role)
ed17c22594 Merge "Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae584ba am: b06c3ed79e am: d27f7a7af7" into nyc-mr2-dev-plus-aosp 2017-02-06 20:56:55 +00:00
Ricardo Loo
8d711bcdc1 Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae584ba am: b06c3ed79e 
am: 27e4cb2e61

Change-Id: Ibc8cc393c800d6d378f873259043d9434bb3ba6e
 2017-02-06 20:56:50 +00:00
Android Build Merger (Role)
eaa6364d1b Merge "docs: Update gluUnProject parameter description. am: 232c4900ac am: cb6a5fc0f3 am: 07b5cf2fb6" into nyc-mr2-dev-plus-aosp 2017-02-06 20:56:31 +00:00
Ricardo Loo
af0ad0a419 Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae584ba am: b06c3ed79e 
am: d27f7a7af7

Change-Id: I0005fda55383977ac84d370e7562fb7de7156f24
 2017-02-06 20:56:05 +00:00
Ricardo Loo
543b773a04 docs: Update gluUnProject parameter description. am: 232c4900ac am: cb6a5fc0f3 
am: 07b5cf2fb6

Change-Id: I6da11429be64951a34c3fab33312b90f4513e8d0
 2017-02-06 20:55:32 +00:00
Ricardo Loo
7ade93fedf docs: Update gluUnProject parameter description. am: 232c4900ac am: cb6a5fc0f3 
am: 94122af913

Change-Id: I35080a02989b25efb690183394b02a724e23acd6
 2017-02-06 20:54:54 +00:00
Paul Lawrence
bff26f4bf1 Merge "Expand whitelist" 
am: 006065fee4

Change-Id: I8e370c7afddc4911e3860d62809fd007bac40a0b
 2017-02-06 20:52:49 +00:00
Ricardo Loo
27e4cb2e61 Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae584ba 
am: b06c3ed79e

Change-Id: Ied57792600e4c832455178fab58c73fa51a32d97
 2017-02-06 20:50:57 +00:00
Ricardo Loo
d27f7a7af7 Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae584ba 
am: b06c3ed79e

Change-Id: I97f1b4559b0c8d4eb3709a455e54157fe3a40426
 2017-02-06 20:50:48 +00:00
Ricardo Loo
07b5cf2fb6 docs: Update gluUnProject parameter description. am: 232c4900ac 
am: cb6a5fc0f3

Change-Id: If34955950f76c9ae8a488f57e7e2d3145bd55543
 2017-02-06 20:49:52 +00:00
Ricardo Loo
94122af913 docs: Update gluUnProject parameter description. am: 232c4900ac 
am: cb6a5fc0f3

Change-Id: Ied7be460f12d29dd1ce77be724c11b78e2179293
 2017-02-06 20:49:49 +00:00
Ricardo Loo
b06c3ed79e Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev 
am: 19dae584ba

Change-Id: I401682a35913ed936d124f7265e3e9338335ccee
 2017-02-06 20:45:27 +00:00
Ricardo Loo
cb6a5fc0f3 docs: Update gluUnProject parameter description. 
am: 232c4900ac

Change-Id: I087f08225229483798997096be428ef89f61d0bb
 2017-02-06 20:45:23 +00:00
Treehugger Robot
006065fee4 Merge "Expand whitelist" 2017-02-06 20:43:02 +00:00
Ricardo Loo
19dae584ba Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev 2017-02-06 20:37:46 +00:00
Tyler Gunn
cd6ccfd23c Framework fixes to support VoLTE conf calls via RemoteConnectionServices. 
Fixing some issues with the addExistingConnection and addConference APIs
on ConnectionService.  When a connection manager relays the addition of
an existing connection or a conference to Telecom, it will assign a new
ID to the new connection/conference.  Due to how RemoteCSes work, the
Connection/Conf will be added directly via TelephonyConnectionService and
also via the connection manager's connection service.  Because the ID
changes, we ended up adding these twice. Conferences weren't a problem in
the GSM conference case because the TElephonyConnectionService's
ConnectionServiceWrapper didn't know of the IDs for the children of the
conference.  However, due to how the existing connections work its not the
case for VoLTE conferences.  To mitigate this, I'm passing the original
connection/conference ID to the connection manager via extras (ugh) and
using this to ensure that when the new existing connection/conference is
added to telecom that the same ID is used.  This ensures that we can
properly de-dupe the requests from TelephonyConnectionService and the
connection manager.

Also, there was some missing code in RemoteConnectionService which would
cause it to not properly track existing connections.

Bug: 31464792
Change-Id: I436f4438fd000ea48ebea7ceb75105bd3f456e46
 2017-02-06 12:31:53 -08:00
Agnieszka Madurska
77ccb23d05 Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev am: 16edc46ca3 
am: 4633240f64

Change-Id: Icb14812f21c3d24dc728f2f2d47e98b917bf8b70
 2017-02-06 19:46:16 +00:00
Aga Madurska
fb286d3f36 Use correct APIs to detect conditions for round scrollbars. am: 99485ef841 
am: 9e7a8688c1

Change-Id: I7538ff25e45ab6199370d529d5ea5db3171efbec
 2017-02-06 19:45:07 +00:00
Agnieszka Madurska
3da7f3d4f1 Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev am: 16edc46ca3 
am: a09e108f65

Change-Id: I664046e043150acbea9615a208a3d185f67d039f
 2017-02-06 19:42:01 +00:00
Aga Madurska
65f351d923 Use correct APIs to detect conditions for round scrollbars. am: 99485ef841 
am: 50bc6a1998

Change-Id: Iab07814fd54b35705a20088e29c78a56ea943eba
 2017-02-06 19:40:50 +00:00
Agnieszka Madurska
4633240f64 Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev 
am: 16edc46ca3

Change-Id: I9060baf17df88095df52f6f06ff1c678eb314e1f
 2017-02-06 19:37:10 +00:00
Aga Madurska
9e7a8688c1 Use correct APIs to detect conditions for round scrollbars. 
am: 99485ef841

Change-Id: I8aaa6bf17e253f6178b96c6743ff7779d5f3b7ef
 2017-02-06 19:37:04 +00:00
Agnieszka Madurska
a09e108f65 Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev 
am: 16edc46ca3

Change-Id: Idb27cb8e19376e11f7ec2e9366c50c8d382cf8ba
 2017-02-06 19:37:03 +00:00
Aga Madurska
50bc6a1998 Use correct APIs to detect conditions for round scrollbars. 
am: 99485ef841

Change-Id: I8301a27b03d1ba64e48064057f112ebaf38eb6c2
 2017-02-06 19:37:00 +00:00
Agnieszka Madurska
16edc46ca3 Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev 2017-02-06 19:30:31 +00:00
Josh Gao
0239f56c8d Merge changes from topic 'debuggerd_ambient' am: 0784e51163 am: ce0722f344 
am: 646e4b3dc0

Change-Id: I14091fcf7be76b7383bbd1c8c1626d76c15220b1
 2017-02-06 19:07:57 +00:00
Josh Gao
646e4b3dc0 Merge changes from topic 'debuggerd_ambient' am: 0784e51163 
am: ce0722f344

Change-Id: I16e66ebc770f0dbe0bcfea088648ad61e1818dd3
 2017-02-06 19:01:58 +00:00
Josh Gao
9862ef9449 zygote: make all capabilities inheritable. am: 45dab78e98 am: 0f2a0b9908 
am: 6f372daa9d

Change-Id: I1144d36ccaafa5d60249eaecbb8c5845c263a666
 2017-02-06 19:00:02 +00:00
Josh Gao
83a2e94983 Revert "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 0a2d61505a am: c75e4153cf 
am: dc3f66c3be

Change-Id: I31dbac8d9f738d198078a22a437cc9b272c46e4b
 2017-02-06 18:59:15 +00:00
Josh Gao
ce0722f344 Merge changes from topic 'debuggerd_ambient' 
am: 0784e51163

Change-Id: I842b682377d92f1b140fe442073d7b97d5090208
 2017-02-06 18:53:04 +00:00
Josh Gao
6f372daa9d zygote: make all capabilities inheritable. am: 45dab78e98 
am: 0f2a0b9908

Change-Id: I864b02533e461c332ad8c8e6c5b931a5dfa9485f
 2017-02-06 18:52:20 +00:00